[jbossws-commits] JBossWS SVN: r16129 - in stack/native/branches/jbossws-native-4.0.x: modules and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 10 04:30:36 EDT 2012
Author: ropalka
Date: 2012-04-10 04:30:31 -0400 (Tue, 10 Apr 2012)
New Revision: 16129
Removed:
stack/native/branches/jbossws-native-4.0.x/.gitignore
stack/native/branches/jbossws-native-4.0.x/README-COMMITTERS
stack/native/branches/jbossws-native-4.0.x/eclipse/
stack/native/branches/jbossws-native-4.0.x/modules/client/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/javax/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/benchmark/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/scripts/zip-other-configs.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8667] Merged revisions 16050 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16050 | ropalka | 2012-03-27 12:02:50 +0200 (Tue, 27 Mar 2012) | 1 line
[JBWS-3474] removing empty dirs and useless benchmark tests
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050
Deleted: stack/native/branches/jbossws-native-4.0.x/.gitignore
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/.gitignore 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/.gitignore 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,45 +0,0 @@
-
-# /
-/target.properties
-/.settings
-/target
-/profiles.xml
-/clipboard.*
-
-# /modules/client/
-/modules/client/target
-
-# /modules/core/
-/modules/core/target
-
-# /modules/endorsed/
-/modules/endorsed/target
-
-# /modules/management/
-/modules/management/target
-
-# /modules/resources/
-/modules/resources/target
-
-# /modules/services/
-/modules/services/target
-
-# /modules/testsuite/framework-tests/
-/modules/testsuite/framework-tests/target
-/modules/testsuite/framework-tests/wsprovide
-/modules/testsuite/framework-tests/work
-/modules/testsuite/framework-tests/wsconsume
-/modules/testsuite/framework-tests/*.log
-/modules/testsuite/framework-tests/*.txt
-
-# /modules/testsuite/framework-tests/src/test/
-/modules/testsuite/framework-tests/src/test/ant-import
-/modules/testsuite/framework-tests/src/test/java
-/modules/testsuite/framework-tests/src/test/resources
-
-# /modules/testsuite/native-tests/
-/modules/testsuite/native-tests/target
-/modules/testsuite/native-tests/tools
-/modules/testsuite/native-tests/wstools
-/modules/testsuite/native-tests/*.log
-/modules/testsuite/native-tests/*.txt
Deleted: stack/native/branches/jbossws-native-4.0.x/README-COMMITTERS
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/README-COMMITTERS 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/README-COMMITTERS 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,4 +0,0 @@
- * If you are using Eclipse then set your code style to eclipse/jboss-style.xml.
- * If you are using Eclipse then set your check style to eclipse/jboss-format.xml.
- * According to http://community.jboss.org/wiki/CopyrightOwnershipandLicenses
- ensure you're putting correct license headers to Java and XML files.
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -59,11 +59,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -93,17 +93,6 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.naming:jnp-client:jar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <scope>test</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<includes>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/scripts/zip-other-configs.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/scripts/zip-other-configs.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/scripts/zip-other-configs.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -31,10 +31,9 @@
<target name="main">
<copy todir="${target.dir}/classes/resources">
<fileset dir="${basedir}/../core/target/resources"/>
- <fileset dir="${basedir}/../client/src/main/resources/META-INF"/>
</copy>
<jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/>
<jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/>
</target>
-
+
</project>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -43,26 +43,6 @@
<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="endorsed.dirs" value="${endorsed.dirs}"/>
- <property name="jboss.home" value="${jboss.home}"/>
- <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>wstools</id>
<phase>test-compile</phase>
<goals>
@@ -81,25 +61,6 @@
</configuration>
</execution>
<execution>
- <id>wsprovide</id>
- <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="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}"/>
- <property name="endorsed.dirs" value="${endorsed.dirs}"/>
- <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" />
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>build-jars</id>
<phase>test-compile</phase>
<goals>
@@ -114,7 +75,6 @@
<ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" />
<ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" />
<ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws" />
- <ant antfile="scripts/build-samples-jaxws.xml" target="build-samples-jaxws" />
</tasks>
</configuration>
</execution>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<project>
-
- <target name="wsconsume" description="Consume JAX-WS contracts">
-
- <taskdef name="wsconsume" classname="org.jboss.ws.tools.ant.WSConsumeTask">
- <classpath>
- <pathelement path="${maven.test.classpath}"/>
- </classpath>
- </taskdef>
-
- <wsconsume-macro
- wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
- package="org.jboss.test.ws.benchmark.jaxws.doclit"
- outputDir="${tests.output.dir}"
- javaEndorsedDirs="${endorsed.dirs}"
- 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"/>
- <attribute name="javaEndorsedDirs"/>
-
- <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=@{javaEndorsedDirs}"/>
- <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
- <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
- </wsconsume>
- </sequential>
-
- </macrodef>
-
-</project>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<project>
-
- <target name="wsprovide" description="Provide the JAX-WS contracts.">
-
- <taskdef name="wsprovide" classname="org.jboss.ws.tools.ant.WSProvideTask">
- <classpath>
- <pathelement path="${maven.test.classpath}"/>
- </classpath>
- </taskdef>
-
- </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"/>
- <attribute name="javaEndorsedDirs"/>
-
- <sequential>
- <wsprovide
- sei="@{sei}"
- fork="true"
- keep="true"
- genwsdl="true"
- verbose="false"
- classpath="@{outputDir}/test-classes"
- destdir="@{outputDir}/test-classes/@{destDir}"
- resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
- sourcedestdir="@{outputDir}/test-sources/@{resourcesDir}"
- >
- <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
- <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
- <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
- </wsprovide>
- </sequential>
-
- </macrodef>
-
-</project>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<project name="JBossWS Benchmarks">
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-benchmark" depends="main">
- <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Testing -->
- <!-- ================================================================== -->
-
- <!-- Run benchmark test cases -->
- <target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
-</project>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -99,114 +99,6 @@
</fileset>
</jar>
- <!-- jaxrpc-benchmark -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-benchmark-rpclit-appclient.jar"/>
- </fileset>
- </jar>
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
- <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-benchmark-doclit-appclient.jar"/>
- </fileset>
- </jar>
-
<!-- jaxrpc-encoded-href.war -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -26,55 +26,10 @@
<description>JBossWS test archive builder</description>
- <!-- ============================================================================== -->
- <!-- Building -->
- <!-- -->
- <!-- Where to create your tests -->
- <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
-
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/test-libs" />
- <!-- jaxws-benchmark-doclit -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class" />
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.xml" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- </war>
-
- <war warfile="${tests.output.dir}/test-libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF">
- <include name="handlers.xml" />
- <include name="sun-jaxws.xml" />
- </webinf>
- </war>
-
- <!-- esb adoption -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.esb">
- <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb/META-INF">
- <include name="*.xml" />
- </metainf>
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-benchmark-doclit.war" />
- </fileset>
- <fileset dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb">
- <include name="*.xml" />
- </fileset>
- </jar>
-
<!-- jaxws-jaxbintros -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 08:02:54 UTC (rev 16128)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 08:30:31 UTC (rev 16129)
@@ -51,7 +51,6 @@
<modules>
<module>modules/endorsed</module>
<module>modules/core</module>
- <module>modules/client</module>
<module>modules/resources</module>
<module>modules/services</module>
</modules>
More information about the jbossws-commits
mailing list