JBossWS SVN: r13576 - in stack/native/trunk/modules/testsuite/shared-tests: src/test and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 10:43:19 -0500 (Wed, 12 Jan 2011)
New Revision: 13576
Modified:
stack/native/trunk/modules/testsuite/shared-tests/
stack/native/trunk/modules/testsuite/shared-tests/src/test/
Log:
updating svn ignores
Property changes on: stack/native/trunk/modules/testsuite/shared-tests
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: stack/native/trunk/modules/testsuite/shared-tests/src/test
___________________________________________________________________
Name: svn:ignore
+ java
scripts
resources
ant-import
14 years, 3 months
JBossWS SVN: r13575 - in stack/native/trunk: modules/management and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 10:34:44 -0500 (Wed, 12 Jan 2011)
New Revision: 13575
Added:
stack/native/trunk/modules/testsuite/shared-tests/
stack/native/trunk/modules/testsuite/shared-tests/pom.xml
stack/native/trunk/modules/testsuite/shared-tests/scripts/
stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml
stack/native/trunk/modules/testsuite/shared-tests/src/
stack/native/trunk/modules/testsuite/shared-tests/src/test/
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy
Removed:
stack/native/trunk/modules/testsuite/framework-tests/
Modified:
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
stack/native/trunk/src/main/scripts/assembly-src-dist.xml
Log:
refactoring to use new SVN module
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2011-01-12 15:12:31 UTC (rev 13574)
+++ stack/native/trunk/modules/management/pom.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -19,8 +19,7 @@
-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
+ <artifactId>jbossws-shared-testsuite</artifactId>
<scope>provided</scope>
<type>zip</type>
</dependency>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-01-12 15:12:31 UTC (rev 13574)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -33,7 +33,7 @@
<!-- Modules -->
<modules>
<module>native-tests</module>
- <module>framework-tests</module>
+ <module>shared-tests</module>
</modules>
<!-- Dependencies -->
Added: stack/native/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/pom.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,154 @@
+<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 Agnostic Tests</name>
+ <artifactId>jbossws-native-shared-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-testsuite</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/test</directory>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/**</include>
+ <include>resources/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- 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-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>src/test</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>wsconsume</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.test.classpath" refid="maven.test.classpath" />
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
+ <property name="tests.output.dir" value="${project.build.directory}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
+ <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.test.classpath" refid="maven.test.classpath" />
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
+ <property name="tests.output.dir" value="${project.build.directory}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
+ <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
+ <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" />
+ <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" />
+ <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>junit-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-junit-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Added: stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,68 @@
+<?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>
+
+ <target name="wsconsume" description="Consume JAX-WS contracts">
+
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
+ package="org.jboss.test.ws.jaxws.complex"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
+ package="org.jboss.test.ws.jaxws.holder"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ </target>
+
+ <macrodef name="wsconsume-macro">
+
+ <attribute name="wsdl"/>
+ <attribute name="package"/>
+ <attribute name="outputDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="log4jConf"/>
+ <attribute name="loggingDir"/>
+
+ <sequential>
+ <wsconsume
+ wsdl="@{wsdl}"
+ package="@{package}"
+ sourcedestdir="@{outputdir}/wsconsume/java"
+ destdir="@{outputdir}"
+ nocompile="true"
+ keep="true"
+ verbose="false"
+ target="2.2"
+ fork="true"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsconsume>
+ </sequential>
+
+ </macrodef>
+
+</project>
Added: stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,59 @@
+<?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>
+
+ <target name="wsprovide" description="Provide JAX-WS contracts">
+
+ <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsprovide-macro
+ sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
+ destdir="jaxws/jbws2960"
+ jbossHome="${jboss.home}"
+ outputDir="${tests.output.dir}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ resourcesDir="jaxws/jbws2960"
+ />
+
+ </target>
+
+ <macrodef name="wsprovide-macro">
+
+ <attribute name="sei"/>
+ <attribute name="destDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="outputDir"/>
+ <attribute name="log4jConf"/>
+ <attribute name="loggingDir"/>
+ <attribute name="resourcesDir"/>
+
+ <sequential>
+ <wsprovide
+ sei="@{sei}"
+ fork="true"
+ genwsdl="true"
+ verbose="false"
+ classpath="@{outputDir}/test-classes"
+ destdir="@{outputDir}/test-classes/@{destDir}"
+ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsprovide>
+ </sequential>
+
+ </macrodef>
+
+</project>
Added: stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,22 @@
+<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>junit-libs</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:junit:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-01-12 15:34:44 UTC (rev 13575)
@@ -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/native/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,80 @@
+<?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="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="INFO"/>
+ <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.ws.core.MessageTrace">
+ <priority value="TRACE"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Apache security is verbose -->
+ <category name="org.apache.xml.security">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Added: stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy 2011-01-12 15:34:44 UTC (rev 13575)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-01-12 15:12:31 UTC (rev 13574)
+++ stack/native/trunk/pom.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -48,7 +48,7 @@
<properties>
<jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
<!-- [JBWS-2505] -->
<!-- START -->
@@ -96,9 +96,8 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>${jbossws.framework.version}</version>
- <classifier>testsuite</classifier>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <version>${jbossws.shared.testsuite.version}</version>
<type>zip</type>
</dependency>
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2011-01-12 15:12:31 UTC (rev 13574)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -82,7 +82,7 @@
</fileSet>
</fileSets>
- <!-- framework tests -->
+ <!-- shared tests -->
<moduleSets>
<moduleSet>
<includes>
@@ -96,7 +96,7 @@
<scope>provided</scope>
<unpack>true</unpack>
<includes>
- <include>*:jbossws-framework:zip:testsuite</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
<unpackOptions>
<includes>
Modified: stack/native/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2011-01-12 15:12:31 UTC (rev 13574)
+++ stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2011-01-12 15:34:44 UTC (rev 13575)
@@ -21,12 +21,12 @@
<outputDirectory>jbossws-native-src-dist/modules/</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
- <exclude>**/framework-tests/**</exclude>
+ <exclude>**/shared-tests/**</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>modules/testsuite/framework-tests</directory>
- <outputDirectory>jbossws-native-src-dist/modules/testsuite/framework-tests</outputDirectory>
+ <directory>modules/testsuite/shared-tests</directory>
+ <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests</outputDirectory>
<includes>
<include>src/test/etc/</include>
<include>scripts/</include>
@@ -46,7 +46,7 @@
</fileSet>
</fileSets>
- <!-- framework tests -->
+ <!-- shared tests -->
<moduleSets>
<moduleSet>
<includes>
@@ -55,12 +55,12 @@
<binaries>
<dependencySets>
<dependencySet>
- <outputDirectory>jbossws-native-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>true</unpack>
<includes>
- <include>*:jbossws-framework:zip:testsuite</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
<unpackOptions>
<includes>
14 years, 3 months
JBossWS SVN: r13574 - in stack/cxf/trunk/modules/testsuite/shared-tests: src/test and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 10:12:31 -0500 (Wed, 12 Jan 2011)
New Revision: 13574
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/
Log:
updating svn ignores
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test
___________________________________________________________________
Name: svn:ignore
+ java
scripts
resources
ant-import
14 years, 3 months
JBossWS SVN: r13573 - in stack/cxf/trunk: modules/management and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:59:57 -0500 (Wed, 12 Jan 2011)
New Revision: 13573
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy
Removed:
stack/cxf/trunk/modules/testsuite/framework-tests/
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml
Log:
refactoring to use new SVN module
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2011-01-12 14:42:38 UTC (rev 13572)
+++ stack/cxf/trunk/modules/management/pom.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -19,8 +19,7 @@
-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
+ <artifactId>jbossws-shared-testsuite</artifactId>
<scope>provided</scope>
<type>zip</type>
</dependency>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-12 14:42:38 UTC (rev 13572)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -32,7 +32,7 @@
<!-- Modules -->
<modules>
<module>cxf-tests</module>
- <module>framework-tests</module>
+ <module>shared-tests</module>
</modules>
<!-- Dependencies -->
Added: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,155 @@
+<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 Agnostic Tests</name>
+ <artifactId>jbossws-cxf-shared-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-testsuite</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/test</directory>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/**</include>
+ <include>resources/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- 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-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>src/test</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>wsconsume</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.test.classpath" refid="maven.test.classpath"/>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <property name="project.version" value="${project.version}"/>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
+ <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.test.classpath" refid="maven.test.classpath"/>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <property name="project.version" value="${project.version}"/>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/>
+ <property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="jboss.home" value="${jboss.home}"/>
+ <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
+ <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>junit-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-junit-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,68 @@
+<?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>
+
+ <target name="wsconsume" description="Consume JAX-WS contracts">
+
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
+ package="org.jboss.test.ws.jaxws.complex"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ <wsconsume-macro
+ wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
+ package="org.jboss.test.ws.jaxws.holder"
+ outputDir="${tests.output.dir}"
+ jbossHome="${jboss.home}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ />
+
+ </target>
+
+ <macrodef name="wsconsume-macro">
+
+ <attribute name="wsdl"/>
+ <attribute name="package"/>
+ <attribute name="outputDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="log4jConf"/>
+ <attribute name="loggingDir"/>
+
+ <sequential>
+ <wsconsume
+ wsdl="@{wsdl}"
+ package="@{package}"
+ sourcedestdir="@{outputdir}/wsconsume/java"
+ destdir="@{outputdir}"
+ nocompile="true"
+ keep="true"
+ verbose="false"
+ target="2.2"
+ fork="true"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsconsume>
+ </sequential>
+
+ </macrodef>
+
+</project>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,59 @@
+<?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>
+
+ <target name="wsprovide" description="Provide JAX-WS contracts">
+
+ <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsprovide-macro
+ sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
+ destdir="jaxws/jbws2960"
+ jbossHome="${jboss.home}"
+ outputDir="${tests.output.dir}"
+ log4jConf="${log4j.conf}"
+ loggingDir="${log4j.output.dir}"
+ resourcesDir="jaxws/jbws2960"
+ />
+
+ </target>
+
+ <macrodef name="wsprovide-macro">
+
+ <attribute name="sei"/>
+ <attribute name="destDir"/>
+ <attribute name="jbossHome"/>
+ <attribute name="outputDir"/>
+ <attribute name="log4jConf"/>
+ <attribute name="loggingDir"/>
+ <attribute name="resourcesDir"/>
+
+ <sequential>
+ <wsprovide
+ sei="@{sei}"
+ fork="true"
+ genwsdl="true"
+ verbose="false"
+ classpath="@{outputDir}/test-classes"
+ destdir="@{outputDir}/test-classes/@{destDir}"
+ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
+ >
+ <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
+ <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
+ </wsprovide>
+ </sequential>
+
+ </macrodef>
+
+</project>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,22 @@
+<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>junit-libs</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:junit:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-01-12 14:59:57 UTC (rev 13573)
@@ -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/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/log4j.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,101 @@
+<?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.test.ws">
+ <priority value="TRACE"/>
+ </category>
+
+ <category name="org.jboss.test.wsf">
+ <priority value="TRACE"/>
+ </category>
+
+ <category name="org.apache.cxf">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.springframework">
+ <priority value="WARN"/>
+ </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>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/tst.policy 2011-01-12 14:59:57 UTC (rev 13573)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-01-12 14:42:38 UTC (rev 13572)
+++ stack/cxf/trunk/pom.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -48,7 +48,7 @@
<properties>
<jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
<!-- JBWS-2505 -->
<!-- START -->
@@ -108,9 +108,8 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>${jbossws.framework.version}</version>
- <classifier>testsuite</classifier>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <version>${jbossws.shared.testsuite.version}</version>
<type>zip</type>
</dependency>
<dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2011-01-12 14:42:38 UTC (rev 13572)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -82,7 +82,7 @@
</fileSet>
</fileSets>
- <!-- framework tests -->
+ <!-- shared tests -->
<moduleSets>
<moduleSet>
<includes>
@@ -96,7 +96,7 @@
<scope>provided</scope>
<unpack>true</unpack>
<includes>
- <include>*:jbossws-framework:zip:testsuite</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
<unpackOptions>
<includes>
Modified: stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2011-01-12 14:42:38 UTC (rev 13572)
+++ stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2011-01-12 14:59:57 UTC (rev 13573)
@@ -21,12 +21,12 @@
<outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
- <exclude>**/framework-tests/**</exclude>
+ <exclude>**/shared-tests/**</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>modules/testsuite/framework-tests</directory>
- <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/framework-tests</outputDirectory>
+ <directory>modules/testsuite/shared-tests</directory>
+ <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests</outputDirectory>
<includes>
<include>src/test/etc/</include>
<include>scripts/</include>
@@ -46,7 +46,7 @@
</fileSet>
</fileSets>
- <!-- framework tests -->
+ <!-- shared tests -->
<moduleSets>
<moduleSet>
<includes>
@@ -55,12 +55,12 @@
<binaries>
<dependencySets>
<dependencySet>
- <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory>
+ <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>true</unpack>
<includes>
- <include>*:jbossws-framework:zip:testsuite</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
<unpackOptions>
<includes>
14 years, 3 months
JBossWS SVN: r13572 - in shared-testsuite/trunk: src/test/scripts and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:42:38 -0500 (Wed, 12 Jan 2011)
New Revision: 13572
Modified:
shared-testsuite/trunk/pom.xml
shared-testsuite/trunk/src/test/scripts/assembly-testsuite.xml
Log:
removing testsuite maven identifier
Modified: shared-testsuite/trunk/pom.xml
===================================================================
--- shared-testsuite/trunk/pom.xml 2011-01-12 14:37:36 UTC (rev 13571)
+++ shared-testsuite/trunk/pom.xml 2011-01-12 14:42:38 UTC (rev 13572)
@@ -30,7 +30,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>testsuite</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: shared-testsuite/trunk/src/test/scripts/assembly-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/scripts/assembly-testsuite.xml 2011-01-12 14:37:36 UTC (rev 13571)
+++ shared-testsuite/trunk/src/test/scripts/assembly-testsuite.xml 2011-01-12 14:42:38 UTC (rev 13572)
@@ -1,6 +1,5 @@
<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>testsuite</id>
<formats>
<format>zip</format>
</formats>
14 years, 3 months
JBossWS SVN: r13571 - shared-testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:37:36 -0500 (Wed, 12 Jan 2011)
New Revision: 13571
Added:
shared-testsuite/trunk/
Log:
refactoring shared testsuite to new SVN module
Copied: shared-testsuite/trunk (from rev 13570, framework/trunk)
14 years, 3 months
JBossWS SVN: r13570 - shared-testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:35:56 -0500 (Wed, 12 Jan 2011)
New Revision: 13570
Removed:
shared-testsuite/trunk/
Log:
remove trunk
14 years, 3 months
JBossWS SVN: r13569 - shared-testsuite/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:34:04 -0500 (Wed, 12 Jan 2011)
New Revision: 13569
Removed:
shared-testsuite/trunk/trunk/
Log:
delete wrong directory tree
14 years, 3 months
JBossWS SVN: r13568 - in hudson/trunk: hudson-home and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:26:56 -0500 (Wed, 12 Jan 2011)
New Revision: 13568
Removed:
hudson/trunk/hudson-home/jobs/AS-6.0.1/
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.1/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
Log:
removing AS 601 related jobs
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/ant.properties.example 2011-01-12 14:26:56 UTC (rev 13568)
@@ -28,10 +28,6 @@
hudson.jboss600.build=jboss-6.0.0.Final
hudson.jboss600.rev=HEAD
-hudson.jboss601.url=http://anonsvn.jboss.org/repos/jbossas/trunk
-hudson.jboss601.build=jboss-6.0.1-SNAPSHOT
-hudson.jboss601.rev=HEAD
-
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -13,7 +13,6 @@
<tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
- <tr><th align=left>@hudson.jboss601.build@</th><td>-r(a)hudson.jboss601.rev@ @hudson.jboss601.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -30,7 +29,6 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-6.0.0</string>
- <string>AS-6.0.1</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -47,7 +45,6 @@
<no-comparator/>
<string>AS-TESTS-ALL</string>
<string>AS-TESTS-AS-6.0.0</string>
- <string>AS-TESTS-AS-6.0.1</string>
</jobNames>
<name>AS Tests</name>
<description>
@@ -69,9 +66,6 @@
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
- <string>NATIVE-CORE-AS-6.0.1-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6</string>
- <string>NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -96,12 +90,6 @@
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -123,15 +111,9 @@
<string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
- <string>CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
- <string>NATIVE-CORE-AS-6.0.1-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-6.0.0, AS-6.0.1</childProjects>
+ <childProjects>AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-TESTS-AS-6.0.0, AS-TESTS-AS-6.0.1</childProjects>
+ <childProjects>AS-TESTS-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -15,18 +15,6 @@
, CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
, CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-6.0.1-SUN-JDK-6
-
-, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.1-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6
-
-, CXF-SRCDIST-AS-6.0.1-SUN-JDK-6
-
-, CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -11,14 +11,6 @@
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
-
-, CXF-CORE-AS-6.0.1-SUN-JDK-6
-
-, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.1-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -9,12 +9,6 @@
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
-
-, NATIVE-CORE-AS-6.0.1-SUN-JDK-6
-
-, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6
-
-, NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -7,10 +7,6 @@
NATIVE-CORE-AS-6.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
-
-, NATIVE-CORE-AS-6.0.1-SUN-JDK-6
-
-, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-01-12 14:20:26 UTC (rev 13567)
+++ hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml 2011-01-12 14:26:56 UTC (rev 13568)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>SWITCH-BINDIST-AS-6.0.0, SWITCH-BINDIST-AS-6.0.1</childProjects>
+ <childProjects>SWITCH-BINDIST-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
14 years, 3 months
JBossWS SVN: r13567 - shared-testsuite/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-12 09:20:26 -0500 (Wed, 12 Jan 2011)
New Revision: 13567
Added:
shared-testsuite/trunk/trunk/
Log:
refactoring shared testsuite to new SVN module
Copied: shared-testsuite/trunk/trunk (from rev 13566, framework/trunk)
14 years, 3 months