From 006eef9ab5641bbde790182d158d9d7a430cedd9 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 19 Dec 2023 20:20:16 +0100
Subject: [PATCH] domain properties order

---
 qserv/hsadmin.properties                      | 14 +++++++++++
 .../main/java/de/hsadmin/mods/dom/Domain.java | 24 +++++++++----------
 2 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 qserv/hsadmin.properties

diff --git a/qserv/hsadmin.properties b/qserv/hsadmin.properties
new file mode 100644
index 0000000..6ae4402
--- /dev/null
+++ b/qserv/hsadmin.properties
@@ -0,0 +1,14 @@
+hsadmin.jms.url=ssl://hsh02.hostsharing.net:61619
+hsadmin.jms.username=user-h98
+hsadmin.jms.password=Duoqu4chae8oofahgei9SouK
+hsadmin.jms.system-queue=queue.hsadminSystem-h98
+hsadmin.jms.status-queue=queue.hsadminStatus
+accountprefix.customer=hsh00
+accountprefix.hostmaster=hsh01
+queues.dns=testdns
+queues.mail=testmail
+hsadmin.smtp.from=peter.hormanns@hostsharing.net
+hsadmin.smtp.cc=peter.hormanns@hostsharing.net
+loginURL=TestUmgebung
+backendURL=https://config.hostsharing.net:443/hsar/backend
+xmlrpcURL=http://localhost:8080/hsar/xmlrpc/hsadmin
diff --git a/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java b/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
index 5090784..20638a9 100644
--- a/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
+++ b/qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
@@ -55,6 +55,10 @@ public class Domain extends AbstractEntity {
 	@Column(name = "domain_dns_master", columnDefinition = "character varying(64)")
 	private String dnsMaster;
 
+	@AnnFieldIO(validation="([a-z0-9\\-]+\\,)*[a-z0-9\\-]+|\\*|", rw=ReadWriteAccess.READWRITE)
+	@Column(name = "valid_subdomain_names", columnDefinition = "character varying(512)")
+	private String validsubdomainnames;
+
 	@AnnFieldIO(validation="[a-zA-Z0-9\\-\\.]*", rw=ReadWriteAccess.READWRITE, referTo=DomainOption.class, selectableValues=DomainOptionValues.class)
 	@ManyToMany(fetch=FetchType.EAGER, cascade=CascadeType.PERSIST)
 	@JoinTable(name="domain__domain_option", 
@@ -62,10 +66,6 @@ public class Domain extends AbstractEntity {
 		inverseJoinColumns={@JoinColumn(name="domain_option_id", referencedColumnName="domain_option_id")})
 	private Set<DomainOption> domainoptions;
 
-	@AnnFieldIO(validation="([a-z0-9\\-]+\\,)*[a-z0-9\\-]+|\\*|", rw=ReadWriteAccess.READWRITE)
-	@Column(name = "valid_subdomain_names", columnDefinition = "character varying(512)")
-	private String validsubdomainnames;
-
 	@AnnFieldIO(validation="[a-zA-Z0-9\\-\\/\\.]*", rw=ReadWriteAccess.READWRITE)
 	@Column(name = "passenger_python", columnDefinition = "character varying(256)")
 	private String passengerpython;
@@ -191,14 +191,6 @@ public class Domain extends AbstractEntity {
 			"obj.user=:loginUser";
 	}
 
-	public Set<DomainOption> getDomainoptions() {
-		return domainoptions;
-	}
-
-	public void setDomainoptions(Set<DomainOption> domainOptions) {
-		this.domainoptions = domainOptions;
-	}
-
 	public String getValidsubdomainnames() {
 		return validsubdomainnames;
 	}
@@ -207,6 +199,14 @@ public class Domain extends AbstractEntity {
 		this.validsubdomainnames = validSubdomainNames;
 	}
 
+	public Set<DomainOption> getDomainoptions() {
+		return domainoptions;
+	}
+
+	public void setDomainoptions(Set<DomainOption> domainOptions) {
+		this.domainoptions = domainOptions;
+	}
+
 	public String getPassengerpython() {
 		return passengerpython;
 	}