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 2012/08/29 12:57:36 UTC
svn commit: r1378499 [1/2] - in /incubator/syncope/branches/1_0_X:
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/ build-tools/
console/ core/ core/src/test/java/org/apache/syncope/core/r...
Author: ilgrosso
Date: Wed Aug 29 10:57:35 2012
New Revision: 1378499
URL: http://svn.apache.org/viewvc?rev=1378499&view=rev
Log:
[SYNCOPE-184] User status information now shown for LDAP resource + all ConnId bundles updated to latest versions
Modified:
incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/console/pom.xml
incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/core/pom.xml
incubator/syncope/branches/1_0_X/build-tools/pom.xml
incubator/syncope/branches/1_0_X/console/pom.xml
incubator/syncope/branches/1_0_X/core/pom.xml
incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
incubator/syncope/branches/1_0_X/core/src/test/resources/content.xml
incubator/syncope/branches/1_0_X/parent/pom.xml
Modified: incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/console/pom.xml Wed Aug 29 10:57:35 2012
@@ -215,37 +215,37 @@ under the License.
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
<cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>
</properties>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/${project.build.finalName}.war</location>
- <properties>
- <context>syncope-console</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>syncope-console</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
Modified: incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/core/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/archetype/src/main/resources/archetype-resources/core/pom.xml Wed Aug 29 10:57:35 2012
@@ -254,33 +254,33 @@ under the License.
<type>standalone</type>
<properties>
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
- <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->
+ <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->
</properties>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
Modified: incubator/syncope/branches/1_0_X/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/build-tools/pom.xml?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/build-tools/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/build-tools/pom.xml Wed Aug 29 10:57:35 2012
@@ -134,15 +134,15 @@ under the License.
<properties>
<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
</properties>
- <deployables>
- <deployable>
- <location>${basedir}/target/syncope-build-tools-${project.version}.war</location>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${basedir}/target/syncope-build-tools-${project.version}.war</location>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/branches/1_0_X/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/console/pom.xml?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/console/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/console/pom.xml Wed Aug 29 10:57:35 2012
@@ -307,7 +307,7 @@ under the License.
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
-<!-- <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
+ <!-- <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
<cargo.jvmargs>-noverify ${javaagent} -Drebel.spring_plugin=false -Xms512m -Xmx1024m -XX:PermSize=512m -XX:MaxPermSize=1024m</cargo.jvmargs>
</properties>
<configfiles>
@@ -317,37 +317,37 @@ under the License.
<tofile>context.xml</tofile>
</configfile>
</configfiles>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/${project.build.finalName}.war</location>
- <properties>
- <context>syncope-console</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+ <context>syncope-console</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/branches/1_0_X/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/core/pom.xml?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/core/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/core/pom.xml Wed Aug 29 10:57:35 2012
@@ -557,33 +557,33 @@ under the License.
<tofile>context.xml</tofile>
</configfile>
</configfiles>
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
- <pingTimeout>60000</pingTimeout>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <type>war</type>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
+ <pingTimeout>60000</pingTimeout>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-build-tools</artifactId>
+ <type>war</type>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
<executions>
<execution>
@@ -1230,32 +1230,31 @@ under the License.
<properties>
<cargo.weblogic.bea.home>${weblogic.home}</cargo.weblogic.bea.home>
</properties>
-
- <deployables>
- <deployable>
- <location>${cargo.run.dir}</location>
- <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
- <pingTimeout>1200000</pingTimeout>
- <properties>
- <context>syncope</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.connid.bundles.soap</groupId>
- <artifactId>wssample</artifactId>
- <type>war</type>
- <properties>
- <context>wssample</context>
- </properties>
- </deployable>
- <deployable>
- <location>${project.build.directory}/syncope-build-tools-test</location>
- <properties>
- <context>syncope-build-tools</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
+ </configuration>
+ <deployables>
+ <deployable>
+ <location>${cargo.run.dir}</location>
+ <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL>
+ <pingTimeout>1200000</pingTimeout>
+ <properties>
+ <context>syncope</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.connid.bundles.soap</groupId>
+ <artifactId>wssample</artifactId>
+ <type>war</type>
+ <properties>
+ <context>wssample</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/syncope-build-tools-test</location>
+ <properties>
+ <context>syncope-build-tools</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
Modified: incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java (original)
+++ incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java Wed Aug 29 10:57:35 2012
@@ -29,9 +29,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.connid.bundles.db.table.DatabaseTableConnector;
import org.connid.bundles.soap.WebServiceConnector;
import org.identityconnectors.common.security.GuardedString;
-import org.identityconnectors.databasetable.DatabaseTableConnector;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.http.HttpStatus;
Modified: incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1378499&r1=1378498&r2=1378499&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java (original)
+++ incubator/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java Wed Aug 29 10:57:35 2012
@@ -1895,11 +1895,11 @@ public class UserTestITCase extends Abst
MembershipTO memb12 = new MembershipTO();
memb12.setRoleId(12L);
- AttributeTO description = new AttributeTO();
- description.setSchema("description");
- description.addValue("description");
+ AttributeTO postalAddress = new AttributeTO();
+ postalAddress.setSchema("postalAddress");
+ postalAddress.addValue("postalAddress");
- memb12.addAttribute(description);
+ memb12.addAttribute(postalAddress);
userTO.addMembership(memb12);
@@ -1923,10 +1923,10 @@ public class UserTestITCase extends Abst
assertNotNull(connObjectTO);
- description = connObjectTO.getAttributeMap().get("description");
- assertNotNull(description);
- assertEquals(1, description.getValues().size());
- assertEquals("description", description.getValues().get(0));
+ postalAddress = connObjectTO.getAttributeMap().get("postalAddress");
+ assertNotNull(postalAddress);
+ assertEquals(1, postalAddress.getValues().size());
+ assertEquals("postalAddress", postalAddress.getValues().get(0));
AttributeTO title = connObjectTO.getAttributeMap().get("title");
assertNotNull(title);
@@ -1956,9 +1956,9 @@ public class UserTestITCase extends Abst
assertNotNull(connObjectTO);
- description = connObjectTO.getAttributeMap().get("description");
- assertTrue(description == null
- || description.getValues().isEmpty() || StringUtils.hasText(description.getValues().get(0)));
+ postalAddress = connObjectTO.getAttributeMap().get("postalAddress");
+ assertTrue(postalAddress == null
+ || postalAddress.getValues().isEmpty() || StringUtils.hasText(postalAddress.getValues().get(0)));
title = connObjectTO.getAttributeMap().get("title");
assertNotNull(title);