syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1545707 - in /syncope/branches/1_1_X/core: ./ src/main/resources/ src/test/java/org/apache/syncope/core/rest/data/ src/test/resources/
Date Tue, 26 Nov 2013 16:15:07 GMT
Author: ilgrosso
Date: Tue Nov 26 16:15:07 2013
New Revision: 1545707

URL: http://svn.apache.org/r1545707
Log:
Cleaning up double DefaultAttributableTransformer definition as discussed in SYNCOPE-449

Added:
    syncope/branches/1_1_X/core/src/main/resources/rest.properties   (with props)
    syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java
      - copied, changed from r1545688, syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.java
    syncope/branches/1_1_X/core/src/test/resources/rest.properties   (with props)
Removed:
    syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.java
Modified:
    syncope/branches/1_1_X/core/pom.xml
    syncope/branches/1_1_X/core/src/main/resources/restContext.xml
    syncope/branches/1_1_X/core/src/main/resources/syncopeContext.xml

Modified: syncope/branches/1_1_X/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/pom.xml?rev=1545707&r1=1545706&r2=1545707&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/pom.xml (original)
+++ syncope/branches/1_1_X/core/pom.xml Tue Nov 26 16:15:07 2013
@@ -429,9 +429,8 @@ under the License.
                       todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync"/>
                 <copy file="${project.build.directory}/test-classes/org/apache/syncope/core/sync/TestSyncRule.class"

                       todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync"/>
-                <copy file="${project.build.directory}/test-classes/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.class"

-                      todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/rest/data"

-                      overwrite="true"/>
+                <copy file="${project.build.directory}/test-classes/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.class"

+                      todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/rest/data"/>
                 <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>
                 <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">
                   <fileset dir="${project.build.directory}/test-classes">

Added: syncope/branches/1_1_X/core/src/main/resources/rest.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/resources/rest.properties?rev=1545707&view=auto
==============================================================================
--- syncope/branches/1_1_X/core/src/main/resources/rest.properties (added)
+++ syncope/branches/1_1_X/core/src/main/resources/rest.properties Tue Nov 26 16:15:07 2013
@@ -0,0 +1,18 @@
+# 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.
+attributableTransformer=org.apache.syncope.core.rest.data.DefaultAttributableTransformer
+controllerHandler=org.apache.syncope.core.rest.controller.ControllerHandler

Propchange: syncope/branches/1_1_X/core/src/main/resources/rest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: syncope/branches/1_1_X/core/src/main/resources/rest.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Modified: syncope/branches/1_1_X/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/resources/restContext.xml?rev=1545707&r1=1545706&r2=1545707&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/resources/restContext.xml (original)
+++ syncope/branches/1_1_X/core/src/main/resources/restContext.xml Tue Nov 26 16:15:07 2013
@@ -34,13 +34,14 @@ under the License.
                            http://www.springframework.org/schema/aop 
                            http://www.springframework.org/schema/aop/spring-aop.xsd">
 
-  <import resource="classpath:META-INF/cxf/cxf.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
-
   <context:component-scan base-package="org.apache.syncope.core.rest.controller"/>
-  <bean class="org.apache.syncope.core.rest.controller.ControllerHandler"/>
+  <bean class="${controllerHandler}"/>
+  <bean class="${attributableTransformer}"/>
 
   <!-- CXF Configuration - BEGIN -->
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+
   <context:component-scan base-package="org.apache.syncope.core.services"/>  
 
   <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
@@ -121,6 +122,7 @@ under the License.
     <constructor-arg ref="xStreamXmlMarshaller"/>
   </bean>
 
+  <!-- Spring MVC Configuration - BEGIN -->
   <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
   <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
     <property name="messageConverters">
@@ -167,7 +169,6 @@ under the License.
 
     <property name="ignoreAcceptHeader" value="false"/>
   </bean>
-  
-  <!-- Attribute transformer for internal storage -->
-  <bean id="attrTransformer" class="org.apache.syncope.core.rest.data.DefaultAttributableTransformer"/>
+  <!-- Spring MVC Configuration - BEGIN -->
+
 </beans>

Modified: syncope/branches/1_1_X/core/src/main/resources/syncopeContext.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/resources/syncopeContext.xml?rev=1545707&r1=1545706&r2=1545707&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/resources/syncopeContext.xml (original)
+++ syncope/branches/1_1_X/core/src/main/resources/syncopeContext.xml Tue Nov 26 16:15:07
2013
@@ -32,6 +32,7 @@ under the License.
     <property name="locations">
       <list>
         <value>classpath:persistence.properties</value>
+        <value>classpath:rest.properties</value>
         <value>classpath:security.properties</value>
         <value>classpath:workflow.properties</value>
       </list>

Copied: syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java
(from r1545688, syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.java)
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java?p2=syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java&p1=syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.java&r1=1545688&r2=1545707&rev=1545707&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DefaultAttributableTransformer.java
(original)
+++ syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.java
Tue Nov 26 16:15:07 2013
@@ -28,7 +28,7 @@ import org.apache.syncope.common.to.Attr
 /**
  * Class for integration tests: transform (by making it double) any attribute value for defined
schema.
  */
-public class DefaultAttributableTransformer implements AttributableTransformer {
+public class DoubleValueAttributableTransformer implements AttributableTransformer {
 
     private static final String NAME = "makeItDouble";
 

Added: syncope/branches/1_1_X/core/src/test/resources/rest.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/resources/rest.properties?rev=1545707&view=auto
==============================================================================
--- syncope/branches/1_1_X/core/src/test/resources/rest.properties (added)
+++ syncope/branches/1_1_X/core/src/test/resources/rest.properties Tue Nov 26 16:15:07 2013
@@ -0,0 +1,18 @@
+# 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.
+attributableTransformer=org.apache.syncope.core.rest.data.DoubleValueAttributableTransformer
+controllerHandler=org.apache.syncope.core.rest.controller.ControllerHandler

Propchange: syncope/branches/1_1_X/core/src/test/resources/rest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: syncope/branches/1_1_X/core/src/test/resources/rest.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id



Mime
View raw message