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/10 14:57:40 UTC
svn commit: r1466462 - in /syncope/trunk: ./
core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
pom.xml
Author: ilgrosso
Date: Wed Apr 10 12:57:39 2013
New Revision: 1466462
URL: http://svn.apache.org/r1466462
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1466065-1466461
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=1466462&r1=1466461&r2=1466462&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 Wed Apr 10 12:57:39 2013
@@ -349,7 +349,7 @@ public class ConnInstanceTestITCase exte
@Test
public void list() {
- List<ConnInstanceTO> connectorInstanceTOs = connectorService.list(null);
+ List<ConnInstanceTO> connectorInstanceTOs = connectorService.list("");
assertNotNull(connectorInstanceTOs);
assertFalse(connectorInstanceTOs.isEmpty());
for (ConnInstanceTO instance : connectorInstanceTOs) {
@@ -409,7 +409,7 @@ public class ConnInstanceTestITCase exte
}
// 2. Check English (default)
- connectorInstanceTOs = connectorService.list(null);
+ connectorInstanceTOs = connectorService.list("");
for (ConnInstanceTO instance : connectorInstanceTOs) {
if ("org.connid.bundles.db.table".equals(instance.getBundleName())) {
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1466462&r1=1466461&r2=1466462&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Apr 10 12:57:39 2013
@@ -290,7 +290,7 @@ under the License.
<activiti.version>5.12</activiti.version>
- <cxf.version>2.7.3</cxf.version>
+ <cxf.version>2.7.4</cxf.version>
<spring.version>3.2.2.RELEASE</spring.version>
<spring-security.version>3.1.3.RELEASE</spring-security.version>
<aspectj.version>1.7.2.RELEASE</aspectj.version>