[SYNCOPE-959] Optional 'domain' property added to enduser.properties - when not 
found, take 'Master'


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1d8b5081
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1d8b5081
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1d8b5081

Branch: refs/heads/master
Commit: 1d8b5081f75df65bfb1e1618412a28a0d3ece1fa
Parents: 19adae0
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Wed Oct 12 14:22:59 2016 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Wed Oct 12 14:23:12 2016 +0200

----------------------------------------------------------------------
 .../syncope/client/enduser/SyncopeEnduserApplication.java    | 8 ++++++++
 .../apache/syncope/client/enduser/SyncopeEnduserSession.java | 4 ++--
 client/enduser/src/main/resources/enduser.properties         | 2 ++
 fit/enduser-reference/src/main/resources/enduser.properties  | 2 ++
 fit/enduser-reference/src/test/resources/enduser.properties  | 2 ++
 5 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/1d8b5081/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
index f47ec8b..8f88801 100644
--- 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
+++ 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
@@ -43,6 +43,7 @@ import 
org.apache.syncope.client.enduser.resources.UserSelfPasswordReset;
 import org.apache.syncope.client.enduser.resources.UserSelfReadResource;
 import org.apache.syncope.client.enduser.resources.UserSelfUpdateResource;
 import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
+import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.wicket.Page;
 import org.apache.wicket.Session;
 import org.apache.wicket.WicketRuntimeException;
@@ -69,6 +70,8 @@ public class SyncopeEnduserApplication extends WebApplication 
implements Seriali
 
     private String license;
 
+    private String domain;
+
     private String adminUser;
 
     private String anonymousUser;
@@ -106,6 +109,7 @@ public class SyncopeEnduserApplication extends 
WebApplication implements Seriali
         Args.notNull(site, "<site> not set");
         license = props.getProperty("license");
         Args.notNull(license, "<license> not set");
+        domain = props.getProperty("domain", SyncopeConstants.MASTER_DOMAIN);
         adminUser = props.getProperty("adminUser");
         Args.notNull(adminUser, "<adminUser> not set");
         anonymousUser = props.getProperty("anonymousUser");
@@ -355,6 +359,10 @@ public class SyncopeEnduserApplication extends 
WebApplication implements Seriali
         return license;
     }
 
+    public String getDomain() {
+        return domain;
+    }
+
     public String getAdminUser() {
         return adminUser;
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/1d8b5081/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
index 74cf6b3..cd2fe24 100644
--- 
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
+++ 
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.syncope.client.lib.SyncopeClient;
-import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.lib.info.PlatformInfo;
 import org.apache.syncope.common.lib.to.PlainSchemaTO;
 import org.apache.syncope.common.lib.to.UserTO;
@@ -103,7 +102,8 @@ public class SyncopeEnduserSession extends WebSession {
 
         try {
             client = SyncopeEnduserApplication.get().getClientFactory().
-                    setDomain(SyncopeConstants.MASTER_DOMAIN).create(username, 
password);
+                    setDomain(SyncopeEnduserApplication.get().getDomain()).
+                    create(username, password);
 
             Pair<Map<String, Set<String>>, UserTO> self = client.self();
             selfTO = self.getValue();

http://git-wip-us.apache.org/repos/asf/syncope/blob/1d8b5081/client/enduser/src/main/resources/enduser.properties
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/enduser.properties 
b/client/enduser/src/main/resources/enduser.properties
index bad773e..2e6fd9b 100644
--- a/client/enduser/src/main/resources/enduser.properties
+++ b/client/enduser/src/main/resources/enduser.properties
@@ -20,6 +20,8 @@ version=${syncope.version}
 site=${project.parent.url}
 license=${licenseUrl}
 
+domain=Master
+
 anonymousUser=${anonymousUser}
 anonymousKey=${anonymousKey}
 adminUser=${adminUser}

http://git-wip-us.apache.org/repos/asf/syncope/blob/1d8b5081/fit/enduser-reference/src/main/resources/enduser.properties
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/main/resources/enduser.properties 
b/fit/enduser-reference/src/main/resources/enduser.properties
index 5c618ed..5f76958 100644
--- a/fit/enduser-reference/src/main/resources/enduser.properties
+++ b/fit/enduser-reference/src/main/resources/enduser.properties
@@ -20,6 +20,8 @@ version=${syncope.version}
 site=${project.parent.url}
 license=${licenseUrl}
 
+domain=Master
+
 anonymousUser=${anonymousUser}
 anonymousKey=${anonymousKey}
 adminUser=${adminUser}

http://git-wip-us.apache.org/repos/asf/syncope/blob/1d8b5081/fit/enduser-reference/src/test/resources/enduser.properties
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/enduser.properties 
b/fit/enduser-reference/src/test/resources/enduser.properties
index d0c1db8..58ed435 100644
--- a/fit/enduser-reference/src/test/resources/enduser.properties
+++ b/fit/enduser-reference/src/test/resources/enduser.properties
@@ -20,6 +20,8 @@ version=${syncope.version}
 site=${project.parent.url}
 license=${licenseUrl}
 
+domain=Master
+
 anonymousUser=${anonymousUser}
 anonymousKey=${anonymousKey}
 adminUser=${adminUser}

Reply via email to