Author: alessio.soldano(a)jboss.com
Date: 2010-06-22 06:38:51 -0400 (Tue, 22 Jun 2010)
New Revision: 12511
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/log4j.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/tst.policy
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/
Removed:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/configuration/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/webserviceref/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/
Modified:
stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
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/modules/testsuite/test-excludes-jboss600.txt
Log:
- Moving tests requiring spring to a separate module
- Minor refactoring to SpringUtil class
Modified:
stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
===================================================================
---
stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-06-22
10:38:51 UTC (rev 12511)
@@ -22,6 +22,7 @@
package org.jboss.wsf.stack.cxf.client.util;
+
/**
*
* @author alessio.soldano(a)jboss.com
@@ -30,16 +31,27 @@
*/
public class SpringUtils
{
- public static boolean isSpringAvailable()
+ /**
+ * Check if Spring is available using the provided classloader
+ *
+ * @param loader
+ * @return true if Spring libs are available
+ */
+ public static boolean isSpringAvailable(ClassLoader... loaders)
{
- try
+ if (loaders == null || loaders.length == 0)
{
-
Thread.currentThread().getContextClassLoader().loadClass("org.springframework.context.ApplicationContext");
- return true;
+ loaders = new ClassLoader[]{Thread.currentThread().getContextClassLoader()};
}
- catch (Exception e)
+ for (ClassLoader cl : loaders)
{
- return false;
+ try
+ {
+ cl.loadClass("org.springframework.context.ApplicationContext");
+ return true;
+ }
+ catch (Exception e) {} //ignore
}
+ return false;
}
}
Modified:
stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
---
stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-06-22
10:38:51 UTC (rev 12511)
@@ -64,7 +64,7 @@
@Override
public void start(Deployment dep)
{
- if (SpringUtils.isSpringAvailable())
+ if (SpringUtils.isSpringAvailable(new
ClassLoader[]{Thread.currentThread().getContextClassLoader(),
dep.getRuntimeClassLoader()}))
{
URL cxfURL = getCXFConfigFromClassLoader(dep);
if (cxfURL == null)
Added: stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/pom.xml
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/pom.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,104 @@
+<project
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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack CXF Spring Tests</name>
+ <artifactId>jbossws-cxf-spring-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-testsuite</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <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 -->
+ <profiles>
+
+ <!--
+ Name: noprepare
+ Descr: Skip test preparation with -Dnoprepare
+ -->
+ <profile>
+ <id>noprepare</id>
+ <activation>
+ <property>
+ <name>!noprepare</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir"
value="${project.build.directory}"/>
+ <property name="tests.resources.dir"
value="${basedir}/src/test/resources"/>
+ <ant antfile="scripts/cxf-jars-jaxws.xml"
target="build-jars-jaxws"/>
+ <ant antfile="scripts/cxf-samples-jaxws.xml"
target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at
http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ==============================================================================
-->
+ <!-- Building
-->
+ <!--
-->
+ <!-- Where to create your tests
-->
+ <!--
http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#...
-->
+ <!--
-->
+ <!-- ==============================================================================
-->
+
+ <target name="build-jars-jaxws" description="Build the
deployments.">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-aegis -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-aegis.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQueryImpl.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-aegis-annotation.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-cxf-configuration -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-cxf-configuration.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/cxf/configuration/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/configuration/Endpoint.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/configuration/EndpointImpl.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/configuration/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-descriptor -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-interop-wstrust10-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
+ <include name="**/*" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-cxf-webserviceref -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-webserviceref.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointImpl.class"/>
+ </classes>
+ </war>
+ <war
destfile="${tests.output.dir}/test-libs/jaxws-cxf-webserviceref-servlet-client.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/Handler.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/ServletClient.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/Endpoint.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF-client">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-wsrm-basic-doc -->
+ <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-wsrm-basic-rpc -->
+ <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-wsrm-basic-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at
http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws
samples deployments">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-jmstransport -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/*.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jbossws-cxf.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar
jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-samples-jmstransport.war"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ <jar
jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-samples-jmstransport.war"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-fromjava-jmstransport -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJmsImpl.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar
jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-fromjava-jmstransport.war"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ <jar
jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-fromjava-jmstransport.war"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
+
+
+
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ <zipfileset
+
dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ <zipfileset
+
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm">
+ <include name="cxf.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"
prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-sign-encrypt -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"
prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign-encrypt-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-username -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wsse-username-authorize -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wsse-username-authorize-custom -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize-custom.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="login-config.xml"/>
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wsseEJB -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.class"/>
+ </fileset>
+
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsseEJB/META-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+
+ </jar>
+
+ <!-- jaxws-samples-wssePolicy-sign -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF"
prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ </war>
+
+ <!-- jaxws-samples-wssePolicy-sign-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wssePolicy-sign-encrypt -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF"
prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ </war>
+
+ <!-- jaxws-samples-wssePolicy-sign-encrypt-client -->
+ <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt-client.jar">
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wssePolicy-username -->
+ <war
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-username.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/log4j.xml
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/log4j.xml
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/log4j.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite:
http://jakarta.apache.org/log4j
+-->
+<log4j:configuration
xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE"
class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="Append" value="true"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L]
%m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE"
class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="WARN"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}]
%m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.wsf">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.test.ws">
+ <priority value="TRACE"/>
+ </category>
+
+ <category name="org.apache.cxf">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.springframework">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="sun.rmi">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="com.sun.xml.bind">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="javax.activation">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Apache security is verbose -->
+ <category name="org.apache.ws.security">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/tst.policy
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/tst.policy
(rev 0)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/etc/tst.policy 2010-06-22
10:38:51 UTC (rev 12511)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/configuration)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/webserviceref)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples
(from rev 12493,
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples)
Property changes on:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples
___________________________________________________________________
Name: svn:mergeinfo
+
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-21
11:51:32 UTC (rev 12510)
+++ stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/pom.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -25,38 +25,6 @@
<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 -->
@@ -89,7 +57,6 @@
<property name="tests.output.dir"
value="${project.build.directory}"/>
<property name="tests.resources.dir"
value="${basedir}/src/test/resources"/>
<ant antfile="scripts/cxf-jars-jaxws.xml"
target="build-jars-jaxws"/>
- <ant antfile="scripts/cxf-samples-jaxws.xml"
target="build-samples-jaxws"/>
</tasks>
</configuration>
</execution>
Modified:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -22,54 +22,6 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
- <!-- jaxws-aegis -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-aegis.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQueryImpl.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-aegis-annotation.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
- </classes>
- </war>
-
- <!-- jaxws-cxf-configuration -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-cxf-configuration.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/cxf/configuration/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/configuration/Endpoint.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/configuration/EndpointImpl.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/configuration/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-descriptor -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
<!-- jaxws-cxf-endorse -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/endorse/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -78,13 +30,6 @@
</classes>
</war>
- <!-- jaxws-cxf-interop-wstrust10-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF">
- <include name="**/*" />
- </metainf>
- </jar>
-
<!-- jaxws-cxf-jaxbintros -->
<jar
destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -113,56 +58,6 @@
</classes>
</war>
- <!-- jaxws-cxf-webserviceref -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-webserviceref.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointImpl.class"/>
- </classes>
- </war>
- <war
destfile="${tests.output.dir}/test-libs/jaxws-cxf-webserviceref-servlet-client.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF-client/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/Handler.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/ServletClient.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/webserviceref/Endpoint.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF-client">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-wsrm-basic-doc -->
- <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-wsrm-basic-rpc -->
- <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/>
- <include
name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-wsrm-basic-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/">
- <include name="cxf.xml" />
- </metainf>
- </jar>
<!-- Please add alphabetically -->
</target>
Deleted:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at
http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-samples-jaxws" description="Build the jaxws
samples deployments">
-
- <mkdir dir="${tests.output.dir}/test-libs"/>
-
- <!-- jaxws-samples-jmstransport -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/*.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jbossws-cxf.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar
jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-jmstransport.war"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- <jar
jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-jmstransport.war"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="hornetq-jms.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-fromjava-jmstransport -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJmsImpl.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar
jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-fromjava-jmstransport.war"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- <jar
jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport-as6.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-fromjava-jmstransport.war"/>
- </fileset>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="hornetq-jms.xml"/>
- </metainf>
- </jar>
-
-
-
- <!-- jaxws-samples-wsa -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- <zipfileset
-
dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
- <!-- jaxws-samples-wsrm -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- <zipfileset
-
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm">
- <include name="cxf.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-sign -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"
prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- </war>
-
- <!-- jaxws-samples-wsse-sign-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-sign-encrypt -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"
prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- </war>
-
- <!-- jaxws-samples-wsse-sign-encrypt-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-username -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-wsse-username-authorize -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-wsse-username-authorize-custom -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize-custom.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="login-config.xml"/>
- <include name="users.properties"/>
- <include name="roles.properties"/>
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-wsseEJB -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.class"/>
- </fileset>
-
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsseEJB/META-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="jboss.xml"/>
- </metainf>
-
- </jar>
-
- <!-- jaxws-samples-wssePolicy-sign -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF"
prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- </war>
-
- <!-- jaxws-samples-wssePolicy-sign-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wssePolicy-sign-encrypt -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF"
prefix="WEB-INF/classes">
- <include name="bob.jks" />
- <include name="bob.properties" />
- </zipfileset>
- </war>
-
- <!-- jaxws-samples-wssePolicy-sign-encrypt-client -->
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt-client.jar">
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF">
- <include name="alice.properties" />
- <include name="alice.jks" />
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wssePolicy-username -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-username.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
Modified:
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-22
10:38:51 UTC (rev 12511)
@@ -39,7 +39,6 @@
import org.jboss.wsf.test.JBossWSTestSetup;
/**
- * Test a CXF endpoint with provided jbossws-cxf.xml
*
* @author alessio.soldano(a)jboss.com
* @since 11-Jun-2010
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-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/framework-tests/pom.xml 2010-06-22
10:38:51 UTC (rev 12511)
@@ -49,48 +49,6 @@
<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-21 11:51:32 UTC
(rev 12510)
+++ stack/cxf/branches/no-spring-support/modules/testsuite/pom.xml 2010-06-22 10:38:51 UTC
(rev 12511)
@@ -313,6 +313,51 @@
</profile>
<!--
+ Name: spring
+ Descr: Add SpringFramework dependencies to test classpath
+ -->
+ <profile>
+ <id>spring</id>
+ <modules>
+ <module>cxf-spring-tests</module>
+ </modules>
+ <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: jboss501
Descr: JBoss-5.0.1 specific options
-->
Modified:
stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss600.txt
===================================================================
---
stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss600.txt 2010-06-21
11:51:32 UTC (rev 12510)
+++
stack/cxf/branches/no-spring-support/modules/testsuite/test-excludes-jboss600.txt 2010-06-22
10:38:51 UTC (rev 12511)
@@ -52,3 +52,7 @@
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
+
+# Temporarly exclude jaxbintro stuff (require additional refactoring on
+# JBossWSConfigurer)
+org/jboss/test/ws/jaxws/cxf/jaxbintros/**