You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/04/15 14:05:49 UTC
svn commit: r1467955 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/services/ core/
core/src/main/java/org/apache/syncope/core/rest/utils/
core/src/main/resources/ core/src/test/java/org/apache/syncope/core/rest/
Author: ilgrosso
Date: Mon Apr 15 12:05:49 2013
New Revision: 1467955
URL: http://svn.apache.org/r1467955
Log:
[SYNCOPE-358] Merge from 1_1_X
Added:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
- copied unchanged from r1467954, syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
Removed:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComperator.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/resources/restContext.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1467916-1467954
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java?rev=1467955&r1=1467954&r2=1467955&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java Mon Apr 15 12:05:49 2013
@@ -22,7 +22,6 @@ import java.util.List;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
-import javax.ws.rs.MatrixParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
@@ -83,8 +82,11 @@ public interface ConnectorService {
@QueryParam("showAll") @DefaultValue("false") boolean showAll);
/**
- * @param lang language to select property keys; default language is English
+ * @param lang language to select property keys, null for default (English).
+ * An ISO 639 alpha-2 or alpha-3 language code, or a language subtag up to 8 characters in length. See the
+ * java.util.Locale class description about valid language values.
* @return list of all connector instances with property keys in the matching language
+ * @see java.util.Locale
*/
@GET
List<ConnInstanceTO> list(@QueryParam("lang") String lang);
@@ -102,7 +104,8 @@ public interface ConnectorService {
* @return connector instance for matching resource
*/
@GET
- ConnInstanceTO readByResource(@MatrixParam("resourceName") String resourceName);
+ @Path("byResource/{resourceName}")
+ ConnInstanceTO readByResource(@PathParam("resourceName") String resourceName);
/**
* @param connInstanceId connector instance id to be updated
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1467955&r1=1467954&r2=1467955&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Apr 15 12:05:49 2013
@@ -764,6 +764,15 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<inherited>true</inherited>
<configuration>
Modified: syncope/trunk/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1467955&r1=1467954&r2=1467955&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ syncope/trunk/core/src/main/resources/restContext.xml Mon Apr 15 12:05:49 2013
@@ -91,7 +91,7 @@ under the License.
<ref bean="userWorkflowServiceImpl"/>
</jaxrs:serviceBeans>
<jaxrs:resourceComparator>
- <bean id="myServiceComparator" class="org.apache.syncope.core.rest.utils.QueryResourceInfoComperator"/>
+ <bean id="myServiceComparator" class="org.apache.syncope.core.rest.utils.QueryResourceInfoComparator"/>
</jaxrs:resourceComparator>
<jaxrs:providers>
<ref bean="jaxbProvider"/>
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1467955&r1=1467954&r2=1467955&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java Mon Apr 15 12:05:49 2013
@@ -349,7 +349,7 @@ public class ConnInstanceTestITCase exte
@Test
public void list() {
- List<ConnInstanceTO> connectorInstanceTOs = connectorService.list("");
+ List<ConnInstanceTO> connectorInstanceTOs = connectorService.list(null);
assertNotNull(connectorInstanceTOs);
assertFalse(connectorInstanceTOs.isEmpty());
for (ConnInstanceTO instance : connectorInstanceTOs) {
@@ -409,7 +409,7 @@ public class ConnInstanceTestITCase exte
}
// 2. Check English (default)
- connectorInstanceTOs = connectorService.list("");
+ connectorInstanceTOs = connectorService.list(null);
for (ConnInstanceTO instance : connectorInstanceTOs) {
if ("org.connid.bundles.db.table".equals(instance.getBundleName())) {