syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [01/18] syncope git commit: [SYNCOPE-641] Applying provided patch
Date Fri, 13 Feb 2015 15:12:21 GMT
Repository: syncope
Updated Branches:
  refs/heads/1_2_X ec5895452 -> 223c0cda4
  refs/heads/2_0_X 5886fdc45 -> 8671ee51e
  refs/heads/master 838c6a8fa -> 5828c103d


[SYNCOPE-641] Applying provided patch


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

Branch: refs/heads/1_2_X
Commit: 7321d79015e036b8bb5829eb33ac6a9f5be5c723
Parents: ec58954
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Fri Feb 13 15:41:20 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Feb 13 15:41:20 2015 +0100

----------------------------------------------------------------------
 client/pom.xml                                  | 30 ++++++++++++++++++++
 .../apache/syncope/client/SyncopeClient.java    |  6 ++--
 .../client/SyncopeClientFactoryBean.java        |  2 +-
 .../client/rest/RestClientFactoryBean.java      |  4 +--
 4 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/7321d790/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 23764ce..d853778 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -67,6 +67,17 @@ under the License.
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+        
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -116,4 +127,23 @@ under the License.
       </resource>
     </resources>
   </build>
+  
+  <profiles>
+    <profile>
+      <id>skipTests</id>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <inherited>true</inherited>
+            <configuration>
+              <skipTests>true</skipTests>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/syncope/blob/7321d790/client/src/main/java/org/apache/syncope/client/SyncopeClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/syncope/client/SyncopeClient.java b/client/src/main/java/org/apache/syncope/client/SyncopeClient.java
index a471d54..1d7120f 100644
--- a/client/src/main/java/org/apache/syncope/client/SyncopeClient.java
+++ b/client/src/main/java/org/apache/syncope/client/SyncopeClient.java
@@ -34,7 +34,7 @@ import org.apache.syncope.common.types.SubjectType;
 
 /**
  * Entry point for client access to all REST services exposed by Syncope core; obtain instances
via
- * <tt>SyncopeClientFactoryBean</tt>.
+ * {@link SyncopeClientFactoryBean}.
  *
  * @see SyncopeClientFactoryBean
  */
@@ -92,7 +92,9 @@ public class SyncopeClient {
      * @return service instance of the given reference class
      */
     public <T> T getService(final Class<T> serviceClass) {
-        return restClientFactory.createServiceInstance(serviceClass, mediaType, username,
password);
+        synchronized (restClientFactory) {
+            return restClientFactory.createServiceInstance(serviceClass, mediaType, username,
password);
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/syncope/blob/7321d790/client/src/main/java/org/apache/syncope/client/SyncopeClientFactoryBean.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/syncope/client/SyncopeClientFactoryBean.java
b/client/src/main/java/org/apache/syncope/client/SyncopeClientFactoryBean.java
index 234625b..0af8e5e 100644
--- a/client/src/main/java/org/apache/syncope/client/SyncopeClientFactoryBean.java
+++ b/client/src/main/java/org/apache/syncope/client/SyncopeClientFactoryBean.java
@@ -35,7 +35,7 @@ import org.apache.syncope.client.rest.RestClientFactoryBean;
 import org.apache.syncope.common.to.AbstractPolicyTO;
 
 /**
- * Factory bean for creating instances of <tt>SyncopeClient</tt>.
+ * Factory bean for creating instances of {@link SyncopeClient}.
  * Supports Spring-bean configuration and override via subclassing (see protected methods).
  */
 public class SyncopeClientFactoryBean {

http://git-wip-us.apache.org/repos/asf/syncope/blob/7321d790/client/src/main/java/org/apache/syncope/client/rest/RestClientFactoryBean.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/syncope/client/rest/RestClientFactoryBean.java
b/client/src/main/java/org/apache/syncope/client/rest/RestClientFactoryBean.java
index e10840a..c3fa42c 100644
--- a/client/src/main/java/org/apache/syncope/client/rest/RestClientFactoryBean.java
+++ b/client/src/main/java/org/apache/syncope/client/rest/RestClientFactoryBean.java
@@ -33,7 +33,7 @@ public class RestClientFactoryBean extends JAXRSClientFactoryBean {
      *
      * @param <T> any service class
      * @param serviceClass service class reference
-     * @param mediaType XML or JSON are suppoorted
+     * @param mediaType XML or JSON are supported
      * @return anonymous service instance of the given reference class
      */
     public <T> T createServiceInstance(final Class<T> serviceClass, final MediaType
mediaType) {
@@ -45,7 +45,7 @@ public class RestClientFactoryBean extends JAXRSClientFactoryBean {
      *
      * @param <T> any service class
      * @param serviceClass service class reference
-     * @param mediaType XML or JSON are suppoorted
+     * @param mediaType XML or JSON are supported
      * @param username username for REST authentication
      * @param password password for REST authentication
      * @return anonymous service instance of the given reference class


Mime
View raw message