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 2014/01/03 14:43:24 UTC
svn commit: r1555086 [3/3] - in /syncope/trunk: ./ common/
common/src/main/java/org/apache/syncope/common/mod/
common/src/main/java/org/apache/syncope/common/reqres/
common/src/main/java/org/apache/syncope/common/services/
common/src/main/java/org/apac...
Modified: syncope/trunk/core/src/main/resources/wadl2html/schema.xsl
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/wadl2html/schema.xsl?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/wadl2html/schema.xsl (original)
+++ syncope/trunk/core/src/main/resources/wadl2html/schema.xsl Fri Jan 3 13:43:23 2014
@@ -118,8 +118,15 @@
<xsl:text>="</xsl:text>
<xsl:choose>
<xsl:when test="contains(., ':') and not(starts-with(., 'xs:'))">
- <a href="#int_{substring-after(., ':')}">
- <xsl:value-of select="."/>
+ <a>
+ <xsl:variable name="current" select="."/>
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="name() = 'ref'">#<xsl:value-of select="substring-after($current, ':')"/></xsl:when>
+ <xsl:otherwise>#int_<xsl:value-of select="substring-after($current, ':')"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:value-of select="$current"/>
</a>
</xsl:when>
<xsl:otherwise>
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java Fri Jan 3 13:43:23 2014
@@ -79,7 +79,7 @@ import org.springframework.transaction.a
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath:syncopeContext.xml",
- "classpath:restContext.xml",
+ "classpath:restTestEnv.xml",
"classpath:persistenceContext.xml",
"classpath:schedulingContext.xml",
"classpath:workflowContext.xml"
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AbstractDAOTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AbstractDAOTest.java?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AbstractDAOTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AbstractDAOTest.java Fri Jan 3 13:43:23 2014
@@ -24,6 +24,6 @@ import org.springframework.test.context.
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:persistenceTestEnv.xml"})
+@ContextConfiguration(locations = { "classpath:persistenceTestEnv.xml" })
public abstract class AbstractDAOTest extends AbstractTest {
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java Fri Jan 3 13:43:23 2014
@@ -50,7 +50,7 @@ import org.apache.syncope.common.util.Co
import org.apache.syncope.common.SyncopeClientException;
import org.apache.syncope.common.reqres.BulkActionResult;
import org.apache.syncope.common.types.ResourceAssociationActionType;
-import org.apache.syncope.common.types.ResourceDeAssociationActionType;
+import org.apache.syncope.common.types.ResourceDeassociationActionType;
import org.identityconnectors.framework.common.objects.Name;
import org.junit.FixMethodOrder;
import org.junit.Test;
@@ -405,7 +405,7 @@ public class RoleTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, actual.getId()));
assertNotNull(roleService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.UNLINK,
+ ResourceDeassociationActionType.UNLINK,
CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -455,7 +455,7 @@ public class RoleTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, actual.getId()));
assertNotNull(roleService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.UNASSIGN,
+ ResourceDeassociationActionType.UNASSIGN,
CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -504,7 +504,7 @@ public class RoleTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, actual.getId()));
assertNotNull(roleService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.DEPROVISION,
+ ResourceDeassociationActionType.DEPROVISION,
CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -572,7 +572,7 @@ public class RoleTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, actual.getId()));
assertNotNull(roleService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.DEPROVISION,
+ ResourceDeassociationActionType.DEPROVISION,
CollectionWrapper.wrap(RESOURCE_NAME_LDAP, ResourceName.class)).
readEntity(BulkActionResult.class));
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java Fri Jan 3 13:43:23 2014
@@ -84,7 +84,7 @@ import org.apache.syncope.common.reqres.
import org.apache.syncope.common.types.Preference;
import org.apache.syncope.common.types.RESTHeaders;
import org.apache.syncope.common.types.ResourceAssociationActionType;
-import org.apache.syncope.common.types.ResourceDeAssociationActionType;
+import org.apache.syncope.common.types.ResourceDeassociationActionType;
import org.identityconnectors.framework.common.objects.Name;
import org.junit.Assume;
import org.junit.FixMethodOrder;
@@ -1853,7 +1853,7 @@ public class UserTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_CSV, AttributableType.USER, actual.getId()));
assertNotNull(userService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.UNLINK,
+ ResourceDeassociationActionType.UNLINK,
CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -1917,7 +1917,7 @@ public class UserTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_CSV, AttributableType.USER, actual.getId()));
assertNotNull(userService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.UNASSIGN,
+ ResourceDeassociationActionType.UNASSIGN,
CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -1982,7 +1982,7 @@ public class UserTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_CSV, AttributableType.USER, actual.getId()));
assertNotNull(userService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.DEPROVISION,
+ ResourceDeassociationActionType.DEPROVISION,
CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceName.class)).
readEntity(BulkActionResult.class));
@@ -2068,7 +2068,7 @@ public class UserTestITCase extends Abst
assertNotNull(resourceService.getConnectorObject(RESOURCE_NAME_CSV, AttributableType.USER, actual.getId()));
assertNotNull(userService.bulkDeassociation(actual.getId(),
- ResourceDeAssociationActionType.DEPROVISION,
+ ResourceDeassociationActionType.DEPROVISION,
CollectionWrapper.wrap(RESOURCE_NAME_CSV, ResourceName.class)).
readEntity(BulkActionResult.class));
Added: syncope/trunk/core/src/test/resources/restTestEnv.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/restTestEnv.xml?rev=1555086&view=auto
==============================================================================
--- syncope/trunk/core/src/test/resources/restTestEnv.xml (added)
+++ syncope/trunk/core/src/test/resources/restTestEnv.xml Fri Jan 3 13:43:23 2014
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<!-- This should not end in *Context as it would then be picked up in the cargo start -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+ <aop:aspectj-autoproxy/>
+
+ <context:component-scan base-package="org.apache.syncope.core.rest.controller"/>
+ <bean class="${controllerHandler}"/>
+ <bean class="${attributableTransformer}"/>
+
+</beans>
Propchange: syncope/trunk/core/src/test/resources/restTestEnv.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/core/src/test/resources/restTestEnv.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: syncope/trunk/core/src/test/resources/restTestEnv.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1555086&r1=1555085&r2=1555086&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Jan 3 13:43:23 2014
@@ -917,6 +917,11 @@ under the License.
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>