[jbossws-commits] JBossWS SVN: r12497 - in stack/cxf/branches/no-spring-support: modules/client and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-06-17 15:21:25 -0400 (Thu, 17 Jun 2010) New Revision: 12497 Added: stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml Modified: stack/cxf/branches/no-spring-support/modules/client/pom.xml stack/cxf/branches/no-spring-support/modules/server/pom.xml stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/no-spring-support/modules/testsuite/framework-tests/pom.xml stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml stack/cxf/branches/no-spring-support/pom.xml stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-artifacts.xml Log: - Setting provided scope to springframework dependencies and moving them to specific profiles - First changes for deploying spring libs separately Modified: stack/cxf/branches/no-spring-support/modules/client/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/client/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/modules/client/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -155,6 +155,7 @@ <artifactId>asm</artifactId> </dependency> + <!-- Spring --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> Modified: stack/cxf/branches/no-spring-support/modules/server/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/server/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/modules/server/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -157,6 +157,8 @@ <groupId>asm</groupId> <artifactId>asm</artifactId> </dependency> + + <!-- Spring --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> @@ -182,12 +184,12 @@ <artifactId>spring-expression</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -21,10 +21,42 @@ <version>${version}</version> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> - <scope>test</scope> + <groupId>org.picketbox</groupId> + <artifactId>picketbox-bare</artifactId> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> </dependencies> <!-- Profiles --> Modified: stack/cxf/branches/no-spring-support/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/framework-tests/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/modules/testsuite/framework-tests/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -49,6 +49,48 @@ <profiles> <!-- + Name: spring + Descr: Add SpringFramework dependencies to test classpath + --> + <profile> + <id>spring</id> + <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + </dependencies> + </profile> + + <!-- Name: noprepare Descr: Skip test preparation with -Dnoprepare --> Modified: stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -525,6 +525,11 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <!-- Exclusion for keeping control over Spring inclusion/exclusion --> + <exclusion> + <groupId>org.jboss.snowdrop</groupId> + <artifactId>jboss-spring-deployer</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> @@ -622,6 +627,11 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <!-- Exclusion for keeping control over Spring inclusion/exclusion --> + <exclusion> + <groupId>org.jboss.snowdrop</groupId> + <artifactId>jboss-spring-deployer</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> Modified: stack/cxf/branches/no-spring-support/pom.xml =================================================================== --- stack/cxf/branches/no-spring-support/pom.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/pom.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -251,6 +251,38 @@ <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -270,6 +302,38 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -297,12 +361,78 @@ <groupId>asm</groupId> <artifactId>asm</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -313,6 +443,38 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -328,6 +490,38 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -344,6 +538,38 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -359,6 +585,38 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -378,6 +636,38 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -397,38 +687,275 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-boolean</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-bug671</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-xjc-dv</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-xjc-ts</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> <groupId>javax.xml</groupId> <artifactId>jaxrpc-api</artifactId> @@ -484,46 +1011,56 @@ <artifactId>asm</artifactId> <version>${cxf.asm.version}</version> </dependency> + <!-- Spring --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-asm</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> <version>${spring.version}</version> - </dependency> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> @@ -721,6 +1258,29 @@ </profile> <!-- + Name: deploy-spring + Descr: Deploy Spring artifacts + --> + <profile> + <id>deploy-spring</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>deploy-spring</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-deploy-spring.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: srcdist Descr: Build the source distribution --> Modified: stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-artifacts.xml 2010-06-17 14:32:18 UTC (rev 12496) +++ stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-artifacts.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -33,14 +33,6 @@ <include>junit:junit:jar</include> <include>org.apache.neethi:neethi:jar</include> <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> - <include>org.springframework:spring-aop:jar</include> - <include>org.springframework:spring-asm:jar</include> - <include>org.springframework:spring-beans:jar</include> - <include>org.springframework:spring-context:jar</include> - <include>org.springframework:spring-core:jar</include> - <include>org.springframework:spring-expression:jar</include> - <include>org.springframework:spring-jms:jar</include> - <include>org.springframework:spring-tx:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.commons.schema:XmlSchema:jar</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> Added: stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml =================================================================== --- stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml (rev 0) +++ stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml 2010-06-17 19:21:25 UTC (rev 12497) @@ -0,0 +1,41 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-spring</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws.cxf:jbossws-cxf-client</include> + <include>org.jboss.ws.cxf:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <includes> + <include>org.springframework:spring-aop:jar</include> + <include>org.springframework:spring-asm:jar</include> + <include>org.springframework:spring-beans:jar</include> + <include>org.springframework:spring-context:jar</include> + <include>org.springframework:spring-core:jar</include> + <include>org.springframework:spring-expression:jar</include> + <include>org.springframework:spring-jms:jar</include> + <include>org.springframework:spring-tx:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> + +</assembly> Property changes on: stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF