May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7191 - stack/cxf/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-28 09:06:38 -0400 (Wed, 28 May 2008) New Revision: 7191 Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-05-28 11:58:41 UTC (rev 7190) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-05-28 13:06:38 UTC (rev 7191) @@ -105,6 +105,8 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> +  + <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7190 - in stack/metro/trunk/modules/testsuite: framework-tests and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-28 07:58:41 -0400 (Wed, 28 May 2008) New Revision: 7190 Added: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml Removed: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/ Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/pom.xml Log: Add noprepare Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -31,62 +31,6 @@ </filesets> </configuration> </plugin> - <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-framework</artifactId> - <classifier>testsuite</classifier> - <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.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <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"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -94,88 +38,78 @@ <profiles>  <profile> - <id>jboss422</id> + <id>noprepare</id> <activation> + <property> + <name>!noprepare</name> + </property> </activation> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> - </configuration> + <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-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss423</id> - <activation> - </activation> - <build> - <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> - </configuration> + <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}"/> + <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="tests.output.dir" value="${project.build.directory}"/> + <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"/> + </tasks> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> </profile> -  - <profile> - <id>jboss500</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss501</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Modified: stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -19,7 +19,7 @@  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -22,132 +22,62 @@ </dependency> </dependencies> -  - <build> - <plugins> - <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.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/metro-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -  <profiles>  <profile> - <id>jboss422</id> + <id>noprepare</id> <activation> + <property> + <name>!noprepare</name> + </property> </activation> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> - </configuration> + <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}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <ant antfile="scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="scripts/metro-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> </profile> -  - <profile> - <id>jboss423</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss500</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss501</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -19,7 +19,7 @@  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Copied: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml (from rev 7186, stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml) =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  +  +  +  +  + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> + <include name="org/jboss/test/ws/wsit/rm/Add.class"/> + <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF"> + <include name="sun-web.xml"/> + <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> + </webinf> + </war> + + </target> + +</project> Copied: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml (from rev 7186, stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml) =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsit-*.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="wsit-client.xml"/> + </metainf> + </jar> + +  + + </target> + +</project> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -16,8 +16,12 @@  <properties> - <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args> - <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> + <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> + <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> + <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> + <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> + <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> + <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet> </properties> @@ -89,13 +93,11 @@  <testResource> <directory>src/test/etc</directory> - <filtering>true</filtering> </testResource>  <testResource> <targetPath>../test-classes</targetPath> <directory>src/test/java</directory> - <filtering>false</filtering> <includes> <include>**/*.xml</include> </includes> @@ -104,17 +106,16 @@ <testResource> <targetPath>../test-resources</targetPath> <directory>src/test/resources</directory> - <filtering>true</filtering> <includes> <include>**/*.wsdl</include> <include>**/*.xml</include> </includes> + <filtering>true</filtering> </testResource>  <testResource> <targetPath>../test-resources</targetPath> <directory>src/test/resources</directory> - <filtering>false</filtering> <excludes> <exclude>**/*.wsdl</exclude> <exclude>**/*.xml</exclude> @@ -123,16 +124,29 @@ </testResources> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>target/wsconsume/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args}</argLine> -  + <failIfNoTests>false</failIfNoTests> <systemProperties> <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> <name>java.naming.provider.url</name> <value>jnp://${jboss.bind.address}:1099</value> </property> @@ -153,13 +167,49 @@ <value>${jbossws.integration.target}</value> </property> <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStoreType</name> + <value>jks</value> + </property> + <property> <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> + <value>${test.archive.directory}</value> </property> <property> + <name>test.classes.directory</name> + <value>${test.classes.directory}</value> + </property> + <property> <name>test.resources.directory</name> - <value>${project.build.directory}/test-resources</value> + <value>${test.resources.directory}</value> </property> + <property> + <name>wsdl.publish.location</name> + <value>${wsdl.publish.location}</value> + </property> </systemProperties> </configuration> </plugin> @@ -170,6 +220,33 @@ <profiles>  + <profile> + <id>debug</id> + <activation> + <property> + <name>debug</name> + </property> + </activation> + <properties> + <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args}</surefire.jvm.args> + </properties> + </profile> + <profile> + <id>no-debug</id> + <activation> + <property> + <name>!debug</name> + </property> + </activation> + <properties> + <surefire.jvm.args>${surefire.security.args}</surefire.jvm.args> + </properties> + </profile> + +  @@ -216,9 +293,16 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -254,9 +338,16 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -297,9 +388,16 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -340,9 +438,16 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -367,7 +472,6 @@ <jboss.bind.address>localhost</jboss.bind.address> </properties> </profile> - </profiles> </project>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7189 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-28 07:36:44 -0400 (Wed, 28 May 2008) New Revision: 7189 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2167] uncomment tests for each AS Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-28 11:32:34 UTC (rev 7188) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-28 11:36:44 UTC (rev 7189) @@ -28,9 +28,6 @@ # [JBWS-2175] wsconsume cannot run with jaxws-api from build output org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* -# [JBWS-2167] Fix samples jaxr for maven build -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-2168] Fix samples bpel for maven build org/jboss/test/ws/jaxrpc/samples/wsbpel/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-28 11:32:34 UTC (rev 7188) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-28 11:36:44 UTC (rev 7189) @@ -26,9 +26,6 @@ org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* -# [JBWS-2167] Fix samples jaxr for maven build -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-2168] Fix samples bpel for maven build org/jboss/test/ws/jaxrpc/samples/wsbpel/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-28 11:32:34 UTC (rev 7188) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-28 11:36:44 UTC (rev 7189) @@ -9,9 +9,6 @@ # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* -# [JBWS-2167] Fix samples jaxr for maven build -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-2168] Fix samples bpel for maven build org/jboss/test/ws/jaxrpc/samples/wsbpel/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-28 11:32:34 UTC (rev 7188) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-28 11:36:44 UTC (rev 7189) @@ -38,9 +38,6 @@ # [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute org/jboss/test/ws/jaxrpc/jbws720/** -# [JBWS-2167] Fix samples jaxr for maven build -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-2168] Fix samples bpel for maven build org/jboss/test/ws/jaxrpc/samples/wsbpel/**

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7188 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-28 07:32:34 -0400 (Wed, 28 May 2008) New Revision: 7188 Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt Log: [JBWS-2167] update client classpath and uncomment tests Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-28 10:38:08 UTC (rev 7187) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-28 11:32:34 UTC (rev 7188) @@ -82,6 +82,25 @@ <version>2.1.0.GA</version> <scope>test</scope> </dependency> +  + <dependency> + <groupId>apache-scout</groupId> + <artifactId>scout</artifactId> + <version>0.7rc2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>juddi</groupId> + <artifactId>juddi</artifactId> + <version>0.9RC4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-saaj</artifactId> + <version>1.2.0.GA</version> + <scope>test</scope> + </dependency> </dependencies>  Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-28 10:38:08 UTC (rev 7187) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-28 11:32:34 UTC (rev 7188) @@ -23,9 +23,6 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* -# [JBWS-2167] Fix samples jaxr for maven build -org/jboss/test/ws/jaxws/samples/jaxr/** - # [JBWS-2168] Fix samples bpel for maven build org/jboss/test/ws/jaxrpc/samples/wsbpel/**

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7187 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-28 06:38:08 -0400 (Wed, 28 May 2008) New Revision: 7187 Modified: stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/jbossws-default-deploy.conf stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml Log: [JBWS-2167] un/deploy juddi-service.sar Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-28 10:38:08 UTC (rev 7187) @@ -171,7 +171,7 @@ <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> Modified: stack/native/trunk/src/main/distro/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/src/main/distro/jbossws-default-deploy.conf 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/jbossws-default-deploy.conf 2008-05-28 10:38:08 UTC (rev 7187) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file Modified: stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-28 10:05:18 UTC (rev 7186) +++ stack/native/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-28 10:38:08 UTC (rev 7187) @@ -248,7 +248,24 @@ </copy> </sequential> </macrodef> + +  +  +  + <macrodef name="macro-deploy-juddi-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest="@{targetdir}"> + <fileset dir="@{thirdpartydir}"> + <include name="juddi-service.sar"/> + </fileset> + </unzip> + </sequential> + </macrodef> +    @@ -372,6 +389,7 @@ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> </target> <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> @@ -382,6 +400,7 @@ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -422,6 +441,9 @@  <delete dir="@{targetdir}"/> +  + <delete dir="@{targetdir}/../juddi-service.sar"/> + </sequential> </macrodef>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7186 - in stack/native/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-28 06:05:18 -0400 (Wed, 28 May 2008) New Revision: 7186 Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2171] ServiceRef injection in EJB3 clients Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-28 09:25:10 UTC (rev 7185) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-28 10:05:18 UTC (rev 7186) @@ -141,8 +141,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> -  + <failIfNoTests>false</failIfNoTests> <systemProperties> <property> <name>java.naming.provider.url</name> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-28 09:25:10 UTC (rev 7185) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-28 10:05:18 UTC (rev 7186) @@ -50,7 +50,7 @@ # [JBWS-2173] Fix eventing for maven build org/jboss/test/ws/jaxws/samples/wseventing/** -# [JBWS-2171] JBossClientMetaData.class not found +# [JBWS-2171] ServiceRef injection in EJB3 clients org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.* # [JBWS-2175] wsconsume cannot run with jaxws-api from build output Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-28 09:25:10 UTC (rev 7185) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-28 10:05:18 UTC (rev 7186) @@ -29,12 +29,12 @@ <unpack>false</unpack> <includes> <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss421:jar:*</include> - <include>*:jbossws-jboss422:jar:*</include> - <include>*:jbossws-jboss423:jar:*</include> - <include>*:jbossws-jboss500:jar:*</include> - <include>*:jbossws-jboss501:jar:*</include> - <include>*:juddi-service:sar:*</include> + <include>*:jbossws-jboss421:jar</include> + <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> + <include>*:jbossws-jboss500:jar</include> + <include>*:jbossws-jboss501:jar</include> + <include>*:juddi-service:sar</include> </includes> </dependencySet> <dependencySet>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7185 - in stack/native/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-28 05:25:10 -0400 (Wed, 28 May 2008) New Revision: 7185 Modified: stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Add juddi-service to deploy artifacts Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-28 07:30:31 UTC (rev 7184) +++ stack/native/trunk/pom.xml 2008-05-28 09:25:10 UTC (rev 7185) @@ -178,7 +178,7 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - +  <dependency> <groupId>javax.ejb</groupId> @@ -423,6 +423,12 @@ <scope>provided</scope> <type>zip</type> </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <scope>provided</scope> + <type>sar</type> + </dependency> </dependencies>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-28 07:30:31 UTC (rev 7184) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-28 09:25:10 UTC (rev 7185) @@ -34,6 +34,7 @@ <include>*:jbossws-jboss423:jar:*</include> <include>*:jbossws-jboss500:jar:*</include> <include>*:jbossws-jboss501:jar:*</include> + <include>*:juddi-service:sar:*</include> </includes> </dependencySet> <dependencySet>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7184 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-28 03:30:31 -0400 (Wed, 28 May 2008) New Revision: 7184 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java Log: [JBWS-2174] fixing regression on AS 4.2.x Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-27 09:02:32 UTC (rev 7183) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-28 07:30:31 UTC (rev 7184) @@ -213,8 +213,20 @@ // put cxf config URL to the property map contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); - if (dep.getType() == DeploymentType.JAXWS_EJB3) + boolean jbossWebMetaDataAvailable = true; + + try { + Class.forName("org.jboss.metadata.web.jboss.JBossWebMetaData"); + } + catch (Exception ignore) + { + // we are not running on AS 5 + jbossWebMetaDataAvailable = false; + } + + if (jbossWebMetaDataAvailable && (dep.getType() == DeploymentType.JAXWS_EJB3)) + { // put cxf config URL to generated web app context params JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class); if (jbwmd != null)

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7183 - in stack/native/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-27 05:02:32 -0400 (Tue, 27 May 2008) New Revision: 7183 Modified: stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Deploy jbossxb to as421 Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/pom.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -105,22 +105,21 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <version>${jbossws.jboss421.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <version>${jbossws.jboss421.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - - <dependency> + + <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <version>${jbossws.jboss421.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss421</artifactId> + <version>${jbossws.jboss421.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <version>${jbossws.jboss422.version}</version> </dependency> @@ -222,6 +221,12 @@ <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${jboss.microcontainer.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </exclusion> + </exclusions> </dependency>  Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -42,11 +42,24 @@ <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> </target> <target name="undeploy-jboss421" depends="target-jboss421,init" description="Remove jbossws from jboss421"> <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <delete file="${jboss421.server.lib}/jbossws-integration.jar"/> </target>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-27 09:01:11 UTC (rev 7182) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-27 09:02:32 UTC (rev 7183) @@ -103,6 +103,15 @@ <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> +  + <dependencySet> + <outputFileNameMapping>jboss-xml-binding.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <includes> + <include>org.jboss:jbossxb:jar:1.0.0.SP1</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7182 - container/jboss42/branches/jbossws-jboss421.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-27 05:01:11 -0400 (Tue, 27 May 2008) New Revision: 7182 Removed: container/jboss42/branches/jbossws-jboss421/profiles.xml Modified: container/jboss42/branches/jbossws-jboss421/ Log: REmove profiles.xml Property changes on: container/jboss42/branches/jbossws-jboss421 ___________________________________________________________________ Name: svn:ignore + profiles.xml Deleted: container/jboss42/branches/jbossws-jboss421/profiles.xml =================================================================== --- container/jboss42/branches/jbossws-jboss421/profiles.xml 2008-05-27 08:43:52 UTC (rev 7181) +++ container/jboss42/branches/jbossws-jboss421/profiles.xml 2008-05-27 09:01:11 UTC (rev 7182) @@ -1,20 +0,0 @@ -<profilesXml 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/profiles-1.0.0.xsd"> - -  - <profiles> - <profile> - <id>user-profile</id> - <activation> - <property> - <name>user.name</name> - </property> - </activation> - <properties> -  - <jboss.local.repository>/home/hbraun/dev/prj/jboss.local.repository</jboss.local.repository> - </properties> - </profile> - </profiles> - -</profilesXml>

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008