Compare commits
No commits in common. "caffaaa2a41c43898785c5e25ac8a9ba4d3be538" and "0ca3cac46582b44f50ef813e9bc9873abb2482d4" have entirely different histories.
caffaaa2a4
...
0ca3cac465
@ -1,14 +0,0 @@
|
||||
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
|
@ -55,10 +55,6 @@ 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",
|
||||
@ -66,6 +62,10 @@ 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 String getValidsubdomainnames() {
|
||||
return validsubdomainnames;
|
||||
}
|
||||
|
||||
public void setValidsubdomainnames(String validSubdomainNames) {
|
||||
this.validsubdomainnames = validSubdomainNames;
|
||||
}
|
||||
|
||||
public Set<DomainOption> getDomainoptions() {
|
||||
return domainoptions;
|
||||
}
|
||||
@ -207,6 +199,14 @@ public class Domain extends AbstractEntity {
|
||||
this.domainoptions = domainOptions;
|
||||
}
|
||||
|
||||
public String getValidsubdomainnames() {
|
||||
return validsubdomainnames;
|
||||
}
|
||||
|
||||
public void setValidsubdomainnames(String validSubdomainNames) {
|
||||
this.validsubdomainnames = validSubdomainNames;
|
||||
}
|
||||
|
||||
public String getPassengerpython() {
|
||||
return passengerpython;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user