[jbossws-commits] JBossWS SVN: r6440 - in stack/cxf/branches/tdiesler/trunk: ant-import-tests and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-15 10:16:02 -0400 (Tue, 15 Apr 2008) New Revision: 6440 Added: stack/cxf/branches/tdiesler/trunk/testsuite/ant/ stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml Removed: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml Modified: stack/cxf/branches/tdiesler/trunk/.classpath stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/testsuite/ Log: Add testsuite Modified: stack/cxf/branches/tdiesler/trunk/.classpath =================================================================== --- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-15 14:13:44 UTC (rev 6439) +++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-15 14:16:02 UTC (rev 6440) @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/test/ws/jaxws/complex/|org/jboss/test/ws/jaxws/holder/|org/jboss/test/ws/jaxws/jbws1840/" kind="src" path="src/test-framework/java"/> <classpathentry kind="src" path="runtime/server/src/main/java"/> + <classpathentry kind="src" path="testsuite/src/test/java"/> <classpathentry kind="src" path="runtime/client/src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar" sourcepath="/M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT-sources.jar"/> <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/> <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> Deleted: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-15 14:13:44 UTC (rev 6439) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-15 14:16:02 UTC (rev 6440) @@ -1,63 +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. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<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-testsuite-jars" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - - <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/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}/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}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/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}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-15 14:13:44 UTC (rev 6439) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-15 14:16:02 UTC (rev 6440) @@ -2,11 +2,12 @@ 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</name> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-cxf</artifactId> <packaging>pom</packaging> + <version>3.0.2-SNAPSHOT</version> - <name>JBoss Web Services - Stack CXF</name> <organization> <name>JBoss, a division of Red Hat</name> @@ -14,6 +15,13 @@ </organization> <url>http://maven.apache.org</url> + <!-- Parent --> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + <!-- Properties --> <properties> <cxf-version>2.0.5-incubator</cxf-version> @@ -111,13 +119,6 @@ </dependency> </dependencies> - <!-- Parent --> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>3</version> - </parent> - <!-- Plugins --> <build> <plugins> Property changes on: stack/cxf/branches/tdiesler/trunk/testsuite ___________________________________________________________________ Name: svn:ignore + target Copied: stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml (from rev 6434, stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/testsuite/ant/build-jars-jaxws.xml 2008-04-15 14:16:02 UTC (rev 6440) @@ -0,0 +1,63 @@ +<?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. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<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" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + + <!-- jaxws-cxf-descriptor --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-wsrm-basic-doc --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/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}/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}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/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}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- Please add alphabetically --> + + </target> + +</project> Added: stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-15 14:16:02 UTC (rev 6440) @@ -0,0 +1,65 @@ +<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 Testsuite</name> + <artifactId>jbossws-cxf-testsuite</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <!-- Properties --> + <properties> + <jbossws.integration.target>jboss500</jbossws.integration.target> + </properties> + + <build> + <testResources> + <testResource> + <targetPath>../resources</targetPath> + <directory>src/test/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="ant/build-jars-jaxws.xml" target="build-jars"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.util.logging.manager</name> + <value>org.jboss.wsf.common.logging.JDKLogManager</value> + </property> + <property> + <name>jbossws.integration.target</name> + <value>${jbossws.integration.target}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF