merge

cli/pom.xml

@@ -14,6 +14,11 @@
 	<name>HSAdmin-Cli</name>
 
 	<dependencies>
+		<dependency>
+			<groupId>de.hsadmin</groupId>
+			<artifactId>framework</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>de.hsadmin</groupId>
 			<artifactId>framework</artifactId>
@@ -37,12 +42,12 @@
 		<dependency>
 			<groupId>jline</groupId>
 			<artifactId>jline</artifactId>
-			<version>2.14.2</version>
+			<version>2.14.5</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.3.1</version>
+			<version>1.4</version>
 		</dependency>
 	</dependencies>
 	<build>

cli/src/main/java/de/hsadmin/jscli/console/ConsoleWrapper.java

@@ -13,6 +13,7 @@ import jline.console.history.FileHistory;
 public class ConsoleWrapper implements PasswordReader {
 
 	private ConsoleReader cons;
+	private FileHistory history; 
 	private String prompt;
 
 	public void open(final String prompt) throws JSCliException {
@@ -22,7 +23,8 @@ public class ConsoleWrapper implements PasswordReader {
 			cons.setExpandEvents(false);
 			cons.setPrompt(prompt);
 			final String userHome = System.getProperty("user.home");
-			cons.setHistory(new FileHistory(new File(userHome + "/.hsscript_history")));		
+			history = new FileHistory(new File(userHome + "/.hsscript_history"));
+			cons.setHistory(history);		
 		} catch (IOException e) {
 			throw new JSCliException(e);
 		}
@@ -37,6 +39,12 @@ public class ConsoleWrapper implements PasswordReader {
 			return line;
 		} catch (IOException e) {
 			throw new JSCliException(e);
+		} finally {
+			try {
+				history.flush();
+			} catch (IOException e) {
+				// dont care about
+			}
 		}
 	}
 	

cust-services/src/main/java/de/hsadmin/bo/customer/MemberShareAction.java

@@ -8,7 +8,7 @@ public enum MemberShareAction {
 	/** Zeichnung */
 	SUBSCRIPTION,
 	
-	/** Kündigung */
+	/** Kuendigung */
 	UNSUBSCRIPTION
 	
 }

cust-services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java

@@ -1,7 +1,5 @@
 package de.hsadmin.bo.pac;
 
-import java.util.Date;
-
 //import javax.jms.JMSException;
 //import javax.jms.Queue;
 //import javax.jms.QueueConnection;

web/src/main/java/de/hsadmin/web/GenericEditorFactory.java

@@ -34,6 +34,9 @@ public class GenericEditorFactory implements IEditorFactory, Serializable {
 			if ("domainoptions".equals(inputName)) {
 				return getDomainOptionsEditor(action, propertyInfo, session, whereContext);
 			}
+			if ("validsubdomainnames".equals(inputName)) {
+				return getValidsubdomainnamesEditor(action, propertyInfo, session, whereContext);
+			}
 		}
 		if ("emailaddress".equals(module) || "emailalias".equals(module)) {
 			if ("target".equals(inputName)) {
@@ -64,6 +67,12 @@ public class GenericEditorFactory implements IEditorFactory, Serializable {
 	}
 
 
+	private IHSEditor getValidsubdomainnamesEditor(final String action, final PropertyInfo propertyInfo, final HSAdminSession session,
+			final Map<String, String> whereContext) {
+		return PanelToolbar.ACTION_EDIT.equals(action) ? getEditor(action, propertyInfo) : new NullEditor();
+	}
+
+
 	private IHSEditor getDomainOptionsEditor(final String action, final PropertyInfo propertyInfo, final HSAdminSession session, final Map<String, String> whereContext) {
 		return PanelToolbar.ACTION_EDIT.equals(action) ? new DomainOptionsEditor(propertyInfo, session, whereContext) : new NullEditor();
 	}

web/src/main/resources/de/hsadmin/web/main_de.properties

@@ -96,7 +96,7 @@ quota_softlimit=Quota (Soft-Limit)
 quota_hardlimit=Quota (Hard-Limit)
 target=Postfach/Weiterleitung
 owner=Domain-Administrator
-validsubdomainnames=gültige Subdomain
+validsubdomainnames=gültige Subdomains  ('*' für Wildcard)
 encoding=Zeichen-Kodierung
 localpart=lokaler Teil
 subdomain=Subdomain