JBossWS SVN: r7201 - in stack/cxf/trunk: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-29 05:43:47 -0400 (Thu, 29 May 2008)
New Revision: 7201
Modified:
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
framework scope=runtime
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-05-29 09:43:40 UTC (rev 7200)
+++ stack/cxf/trunk/pom.xml 2008-05-29 09:43:47 UTC (rev 7201)
@@ -281,26 +281,22 @@
</dependencies>
</dependencyManagement>
- <!-- Dependencies -->
+ <!-- Runtime dependencies, not visible at compile time -->
<dependencies>
-
- <!-- Provided dependencies, visible to all modules -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>scripts</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>testsuite</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
-
- <!-- Runtime dependencies, not visible at compile time -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:43:40 UTC (rev 7200)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:43:47 UTC (rev 7201)
@@ -13,7 +13,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:scripts</include>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7200 - 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-29 05:43:40 -0400 (Thu, 29 May 2008)
New Revision: 7200
Modified:
stack/native/trunk/
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
framework scope=runtime
Property changes on: stack/native/trunk
___________________________________________________________________
Name: svn:ignore
- target.properties
.settings
target
profiles.xml
+ target.properties
.settings
target
profiles.xml
clipboard.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-05-29 09:32:33 UTC (rev 7199)
+++ stack/native/trunk/pom.xml 2008-05-29 09:43:40 UTC (rev 7200)
@@ -385,103 +385,103 @@
</dependencies>
</dependencyManagement>
- <!-- Dependencies -->
+ <!-- Runtime dependencies, not visible at compile time -->
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>scripts</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>testsuite</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss421</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss421</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<classifier>container</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
<classifier>container</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>sar</type>
</dependency>
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:32:33 UTC (rev 7199)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:43:40 UTC (rev 7200)
@@ -13,7 +13,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:scripts</include>
@@ -25,7 +25,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>false</unpack>
<includes>
<include>*:jbossws-framework:jar</include>
@@ -46,7 +46,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>false</unpack>
<includes>
<include>*:jbossws-jboss500:jar:container</include>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7199 - in stack/cxf/trunk: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-29 05:32:33 -0400 (Thu, 29 May 2008)
New Revision: 7199
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Switch container integration to scope=runtime
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-29 09:16:17 UTC (rev 7198)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-29 09:32:33 UTC (rev 7199)
@@ -25,14 +25,10 @@
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.jboss.logging.Logger;
-import org.jboss.metadata.javaee.spec.ParamValueMetaData;
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -212,53 +208,6 @@
}
// put cxf config URL to the property map
contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
-
- 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)
- {
- boolean alreadySet = false;
- List<ParamValueMetaData> ctxParams = jbwmd.getContextParams();
- if (ctxParams == null)
- {
- ctxParams = new ArrayList<ParamValueMetaData>();
- jbwmd.setContextParams(ctxParams);
- }
-
- if (ctxParams.size() > 0)
- {
- for (ParamValueMetaData pvmd : ctxParams)
- {
- if (pvmd.getParamName().equals(CXFServletExt.PARAM_CXF_BEANS_URL))
- {
- alreadySet = true;
- }
- }
- }
-
- if (false == alreadySet)
- {
- ParamValueMetaData pvmd = new ParamValueMetaData();
- pvmd.setParamName(CXFServletExt.PARAM_CXF_BEANS_URL);
- pvmd.setParamValue(cxfURL.toExternalForm());
- ctxParams.add(pvmd);
- }
- }
- }
}
}
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-05-29 09:16:17 UTC (rev 7198)
+++ stack/cxf/trunk/pom.xml 2008-05-29 09:32:33 UTC (rev 7199)
@@ -283,6 +283,8 @@
<!-- Dependencies -->
<dependencies>
+
+ <!-- Provided dependencies, visible to all modules -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
@@ -297,64 +299,66 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
+
+ <!-- Runtime dependencies, not visible at compile time -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<classifier>container</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
<classifier>container</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
<classifier>resources</classifier>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>zip</type>
</dependency>
</dependencies>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:16:17 UTC (rev 7198)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:32:33 UTC (rev 7199)
@@ -25,20 +25,20 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss422:jar:*</include>
- <include>*:jbossws-jboss423:jar:*</include>
- <include>*:jbossws-jboss500:jar:*</include>
- <include>*:jbossws-jboss501:jar:*</include>
+ <include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
+ <include>*:jbossws-jboss500:jar</include>
+ <include>*:jbossws-jboss501:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>runtime</scope>
<unpack>false</unpack>
<includes>
<include>*:jbossws-jboss500:jar:container</include>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7198 - in stack/native/trunk: modules/testsuite and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-29 05:16:17 -0400 (Thu, 29 May 2008)
New Revision: 7198
Added:
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml
Modified:
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml
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-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2168] reincarnate BPEL tests
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -44,6 +44,22 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>bpel</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="${test.resources.directory}"/>
+ <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/-->
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="scripts/antrun-bpel.xml" target="bpel"/>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
<id>wsconsume</id>
<phase>generate-sources</phase>
<goals>
@@ -52,7 +68,8 @@
<configuration>
<tasks>
<property name="maven.test.classpath" refid="maven.test.classpath"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.resources.dir" value="${test.resources.directory}"/>
+ <!--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"/>
@@ -68,7 +85,8 @@
<configuration>
<tasks>
<property name="maven.test.classpath" refid="maven.test.classpath"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.resources.dir" value="${test.resources.directory}"/>
+ <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/-->
<property name="tests.output.dir" value="${project.build.directory}"/>
<property name="jboss.bind.address" value="${jboss.bind.address}"/>
<property name="java.jdk15.home" value="${java.jdk15.home}"/>
@@ -85,7 +103,8 @@
<configuration>
<tasks>
<property name="maven.test.classpath" refid="maven.test.classpath"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.resources.dir" value="${test.resources.directory}"/>
+ <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/-->
<property name="tests.output.dir" value="${project.build.directory}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
</tasks>
@@ -100,7 +119,8 @@
<configuration>
<tasks>
<property name="tests.output.dir" value="${project.build.directory}"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.resources.dir" value="${test.resources.directory}"/>
+ <!--property name="tests.resources.dir" value="${basedir}/src/test/resources"/-->
<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"/>
Added: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- BPEL -->
+ <!-- ================================================================== -->
+
+ <target name="bpel" description="Generate jBPM-BPEL artifacts">
+
+ <property name="thirdparty.dir" value="${tests.output.dir}/../../../../target/deploy-artifacts/lib/"/>
+
+ <!-- ensure classpath preconditions -->
+ <fail message="File ${thirdparty.dir}/bpel.sar is not available">
+ <condition><not><available file="${thirdparty.dir}/bpel.sar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/commons-collections.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/commons-collections.jar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/dom4j.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/dom4j.jar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/jaxen.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/jaxen.jar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/jboss-common-logging-log4j.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/jboss-common-logging-log4j.jar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/commons-logging.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/commons-logging.jar"/></not></condition>
+ </fail>
+ <fail message="File ${thirdparty.dir}/wsdl4j.jar is not available">
+ <condition><not><available file="${thirdparty.dir}/wsdl4j.jar"/></not></condition>
+ </fail>
+
+ <!-- The jBPM BPEL classpath -->
+ <unzip src="${thirdparty.dir}/bpel.sar" dest="${thirdparty.dir}/jbpm-bpel"/>
+ <path id="jbpm.bpel.classpath">
+ <pathelement path="${maven.test.classpath}"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${thirdparty.dir}/commons-collections.jar"/>
+ <pathelement location="${thirdparty.dir}/dom4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxen.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common-logging-log4j.jar"/>
+ <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ </path>
+
+ <!-- create jBPM process archives -->
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+ <zip destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+
+ <!-- Copy the BPEL sar to tests lib directory -->
+ <copy file="${thirdparty.dir}/bpel.sar" tofile="${tests.output.dir}/test-libs/jbpm-bpel.sar"/>
+
+ <!-- generate wsdl binding and service definitions for bpel processes -->
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpm.bpel.classpath"/>
+ </taskdef>
+
+ <servicegen
+ processfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
+ bindingfile="hello-binding-.wsdl"
+ servicefile="hello-service.wsdl"/>
+
+ </target>
+
+</project>
Property changes on: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -43,7 +43,7 @@
<macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
- <!--wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/-->
+ <macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/>
</target>
@@ -104,4 +104,4 @@
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -633,7 +633,7 @@
</metainf>
</jar>
- <!-- jaxrpc-samples-wsbpel - ->
+ <!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
@@ -661,7 +661,7 @@
<metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
- </jar-->
+ </jar>
<!-- jaxrpc-samples-wssecurity-sign -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -4,7 +4,7 @@
<package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello"
namespace="http://jbpm.org/examples/hello" />
</global>
- <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/hello-service.wsdl">
+ <wsdl-java location="@test.resources.directory@/../wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/hello-service.wsdl">
<mapping file="jaxrpc-mapping.xml" />
</wsdl-java>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 09:16:17 UTC (rev 7198)
@@ -28,9 +28,6 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-# [JBWS-2168] Fix samples bpel for maven build
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 09:16:17 UTC (rev 7198)
@@ -26,9 +26,6 @@
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
-# [JBWS-2168] Fix samples bpel for maven build
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 09:16:17 UTC (rev 7198)
@@ -9,9 +9,6 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-# [JBWS-2168] Fix samples bpel for maven build
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-29 09:16:17 UTC (rev 7198)
@@ -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-2168] Fix samples bpel for maven build
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-29 09:16:17 UTC (rev 7198)
@@ -38,9 +38,6 @@
# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
org/jboss/test/ws/jaxrpc/jbws720/**
-# [JBWS-2168] Fix samples bpel for maven build
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/pom.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -53,6 +53,10 @@
<jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
+ <commons.collections.version>3.1</commons.collections.version>
+ <dom4j.version>1.6.1</dom4j.version>
+ <jaxen.version>1.1-beta-11</jaxen.version>
+ <jboss.common.logging.log4j.version>2.0.4.GA</jboss.common.logging.log4j.version>
<javassist.version>3.6.0.GA</javassist.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
@@ -69,6 +73,7 @@
<wsdl4j.version>1.6.1</wsdl4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
<xalan.version>2.7.0</xalan.version>
+ <jbpm.bpel.version>1.1.0.Beta5</jbpm.bpel.version>
</properties>
<!-- DependencyManagement -->
@@ -236,6 +241,50 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>${jaxen.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ <version>${jboss.common.logging.log4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${sun.fastinfoset.version}</version>
@@ -327,6 +376,12 @@
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
</dependency>
+ <dependency>
+ <groupId>jboss.jbpm</groupId>
+ <artifactId>bpel</artifactId>
+ <version>${jbpm.bpel.version}</version>
+ <type>sar</type>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -429,6 +484,32 @@
<scope>provided</scope>
<type>sar</type>
</dependency>
+ <dependency>
+ <groupId>jboss.jbpm</groupId>
+ <artifactId>bpel</artifactId>
+ <scope>provided</scope>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:08:15 UTC (rev 7197)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:16:17 UTC (rev 7198)
@@ -35,6 +35,11 @@
<include>*:jbossws-jboss500:jar</include>
<include>*:jbossws-jboss501:jar</include>
<include>*:juddi-service:sar</include>
+ <include>*:bpel:sar</include>
+ <include>*:commons-collections:jar</include>
+ <include>*:dom4j:jar</include>
+ <include>*:jaxen:jar</include>
+ <include>*:jboss-common-logging-log4j:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -158,4 +163,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7197 - in stack/cxf/trunk/modules/testsuite: cxf-tests and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-29 05:08:15 -0400 (Thu, 29 May 2008)
New Revision: 7197
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Add -Dnoprepare
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-05-29 07:09:24 UTC (rev 7196)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197)
@@ -14,116 +14,47 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <ant antfile="src/scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="src/scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
+
<!-- Profiles -->
<profiles>
<!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Name: noprepare
+ Descr: Skip test preparation with -Dnoprepare
-->
<profile>
- <id>jboss422</id>
+ <id>noprepare</id>
<activation>
+ <property>
+ <name>!noprepare</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
</profile>
- <!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts (from rev 7196, stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts)
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-29 07:09:24 UTC (rev 7196)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197)
@@ -32,46 +32,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>
- <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>
@@ -79,88 +39,62 @@
<profiles>
<!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Name: noprepare
+ Descr: Skip test preparation with -Dnoprepare
-->
<profile>
- <id>jboss422</id>
+ <id>noprepare</id>
<activation>
+ <property>
+ <name>!noprepare</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <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>
-
- <!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <activation>
- </activation>
- <build>
- <plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="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>
- <!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-29 07:09:24 UTC (rev 7196)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-29 09:08:15 UTC (rev 7197)
@@ -16,8 +16,8 @@
<!-- Properties -->
<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>
@@ -111,8 +111,27 @@
</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>
+ <failIfNoTests>false</failIfNoTests>
<systemProperties>
<property>
<name>java.naming.provider.url</name>
@@ -139,6 +158,30 @@
<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>${test.archive.directory}</value>
</property>
@@ -164,6 +207,33 @@
<profiles>
<!--
+ Name: debug
+ Descr: Enable remote debuging for tests
+ -->
+ <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>
+
+ <!--
Name: hudson
Descr: Ignore test failures on hudson
-->
@@ -205,6 +275,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
@@ -238,6 +315,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
@@ -281,9 +365,16 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
</configuration>
</plugin>
</plugins>
@@ -314,6 +405,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7196 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout: publish and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-29 03:09:24 -0400 (Thu, 29 May 2008)
New Revision: 7196
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java
Log:
refactoring - no functional change
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java 2008-05-29 07:09:24 UTC (rev 7196)
@@ -0,0 +1,383 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.
+ */
+package org.jboss.test.ws.jaxws.samples.jaxr.scout;
+
+import java.net.PasswordAuthentication;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.xml.registry.BulkResponse;
+import javax.xml.registry.BusinessLifeCycleManager;
+import javax.xml.registry.BusinessQueryManager;
+import javax.xml.registry.Connection;
+import javax.xml.registry.ConnectionFactory;
+import javax.xml.registry.FindQualifier;
+import javax.xml.registry.JAXRException;
+import javax.xml.registry.RegistryService;
+import javax.xml.registry.infomodel.Classification;
+import javax.xml.registry.infomodel.ClassificationScheme;
+import javax.xml.registry.infomodel.EmailAddress;
+import javax.xml.registry.infomodel.ExternalIdentifier;
+import javax.xml.registry.infomodel.InternationalString;
+import javax.xml.registry.infomodel.Key;
+import javax.xml.registry.infomodel.LocalizedString;
+import javax.xml.registry.infomodel.Organization;
+import javax.xml.registry.infomodel.PersonName;
+import javax.xml.registry.infomodel.PostalAddress;
+import javax.xml.registry.infomodel.RegistryObject;
+import javax.xml.registry.infomodel.Service;
+import javax.xml.registry.infomodel.ServiceBinding;
+import javax.xml.registry.infomodel.TelephoneNumber;
+import javax.xml.registry.infomodel.User;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+/**
+ * Acts as the base class for Jaxr Test Cases
+ *
+ * @author Anil.Saldhana(a)jboss.org
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 29-Dec-2004
+ */
+public class JaxrAbstractBase extends JBossWSTest
+{
+ protected String userid = "jboss";
+ protected String passwd = "jboss";
+ protected BusinessLifeCycleManager blm = null;
+ protected RegistryService rs = null;
+ protected BusinessQueryManager bqm = null;
+ protected Connection connection = null;
+ protected BulkResponse br = null;
+ protected MBeanServerConnection server = null;
+
+ protected ConnectionFactory factory = null;
+
+ protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi");
+
+ /**
+ * Setup of the JUnit test
+ * We create the juddi tables on startup
+ *
+ * @throws Exception
+ */
+ protected void setUp() throws Exception
+ {
+ //Change the createonstart setting for juddi service and restart it
+ server = getServer();
+ server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() });
+ server.invoke(OBJECT_NAME, "stop", null, null);
+ server.invoke(OBJECT_NAME, "start", null, null);
+
+ //Ensure that the Jaxr Connection Factory class is setup
+ String factoryString = "javax.xml.registry.ConnectionFactoryClass";
+ String factoryClass = System.getProperty(factoryString);
+ if (factoryClass == null || factoryClass.length() == 0)
+ System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+ String queryurl = System.getProperty("jaxr.query.url", "http://" + getServerHost() + ":8080/juddi/inquiry");
+ String puburl = System.getProperty("jaxr.publish.url", "http://" + getServerHost() + ":8080/juddi/publish");
+
+ Properties props = new Properties();
+ props.setProperty("javax.xml.registry.queryManagerURL", queryurl);
+ props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl);
+
+ String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport");
+ System.setProperty("juddi.proxy.transportClass", transportClass);
+
+ // Create the connection, passing it the configuration properties
+ factory = ConnectionFactory.newInstance();
+ factory.setProperties(props);
+ connection = factory.createConnection();
+ }
+
+ /**
+ * Teardown of the junit test
+ * We discard all the tables created by the juddi service
+ *
+ * @throws Exception
+ */
+ protected void tearDown() throws Exception
+ {
+ if (connection != null)
+ connection.close();
+
+ //stop the juddi service so that all the tables are dropped
+ server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() });
+ server.invoke(OBJECT_NAME, "stop", null, null);
+ }
+
+ /**
+ * Does authentication with the uddi registry
+ */
+ protected void login() throws JAXRException
+ {
+ PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray());
+ Set creds = new HashSet();
+ creds.add(passwdAuth);
+
+ connection.setCredentials(creds);
+ }
+
+ protected void getJAXREssentials() throws JAXRException
+ {
+ rs = connection.getRegistryService();
+ blm = rs.getBusinessLifeCycleManager();
+ bqm = rs.getBusinessQueryManager();
+ }
+
+ public InternationalString getIString(String str) throws JAXRException
+ {
+ return blm.createInternationalString(str);
+ }
+
+ /**
+ * Locale aware Search a business in the registry
+ */
+ public void searchBusiness(String bizname) throws JAXRException
+ {
+ try
+ {
+ // Get registry service and business query manager
+ this.getJAXREssentials();
+
+ // Define find qualifiers and name patterns
+ Collection findQualifiers = new ArrayList();
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
+ Collection namePatterns = new ArrayList();
+ String pattern = "%" + bizname + "%";
+ LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern);
+ namePatterns.add(ls);
+
+ // Find based upon qualifier type and values
+ BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null);
+
+ // check how many organisation we have matched
+ Collection orgs = response.getCollection();
+ if (orgs == null)
+ {
+ log.debug(" -- Matched 0 orgs");
+
+ }
+ else
+ {
+ log.debug(" -- Matched " + orgs.size() + " organizations -- ");
+
+ // then step through them
+ for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();)
+ {
+ Organization org = (Organization)orgIter.next();
+ log.debug("Org name: " + getName(org));
+ log.debug("Org description: " + getDescription(org));
+ log.debug("Org key id: " + getKey(org));
+ checkUser(org);
+ checkServices(org);
+ }
+ }
+ }
+ finally
+ {
+ connection.close();
+ }
+
+ }
+
+ protected RegistryService getRegistryService() throws JAXRException
+ {
+ assertNotNull(connection);
+ return connection.getRegistryService();
+ }
+
+ protected BusinessQueryManager getBusinessQueryManager() throws JAXRException
+ {
+ assertNotNull(connection);
+ if (rs == null)
+ rs = this.getRegistryService();
+ return rs.getBusinessQueryManager();
+ }
+
+ protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException
+ {
+ assertNotNull(connection);
+ if (rs == null)
+ rs = this.getRegistryService();
+ return rs.getBusinessLifeCycleManager();
+ }
+
+ private void checkServices(Organization org) throws JAXRException
+ {
+ // Display service and binding information
+ Collection services = org.getServices();
+ for (Iterator svcIter = services.iterator(); svcIter.hasNext();)
+ {
+ Service svc = (Service)svcIter.next();
+ log.debug(" Service name: " + getName(svc));
+ log.debug(" Service description: " + getDescription(svc));
+
+ assertEquals("JBOSS JAXR Service", getName(svc));
+ assertEquals("Services of XML Registry", getDescription(svc));
+
+ Collection serviceBindings = svc.getServiceBindings();
+ for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();)
+ {
+ ServiceBinding sb = (ServiceBinding)sbIter.next();
+ log.debug(" Binding Description: " + getDescription(sb));
+ log.debug(" Access URI: " + sb.getAccessURI());
+ assertEquals("http://testjboss.org", sb.getAccessURI());
+ assertEquals("Service Binding", getDescription(sb));
+ }
+ }
+ }
+
+ private void checkUser(Organization org) throws JAXRException
+ {
+ // Display primary contact information
+ User pc = org.getPrimaryContact();
+ if (pc != null)
+ {
+ PersonName pcName = pc.getPersonName();
+ log.debug(" Contact name: " + pcName.getFullName());
+ assertEquals("Anil S", pcName.getFullName());
+ Collection phNums = pc.getTelephoneNumbers(pc.getType());
+ for (Iterator phIter = phNums.iterator(); phIter.hasNext();)
+ {
+ TelephoneNumber num = (TelephoneNumber)phIter.next();
+ log.debug(" Phone number: " + num.getNumber());
+ }
+ Collection eAddrs = pc.getEmailAddresses();
+ for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();)
+ {
+ log.debug(" Email Address: " + (EmailAddress)eaIter.next());
+ }
+ }
+ }
+
+ private static String getName(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getName() != null)
+ {
+ return ro.getName().getValue();
+ }
+ return "";
+ }
+
+ private static String getDescription(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getDescription() != null)
+ {
+ return ro.getDescription().getValue();
+ }
+ return "";
+ }
+
+ private static String getKey(RegistryObject ro) throws JAXRException
+ {
+ if (ro != null && ro.getKey() != null)
+ {
+ return ro.getKey().getId();
+ }
+ return "";
+ }
+
+ /**
+ * Creates a Jaxr Organization with 1 or more services
+ */
+ protected Organization createOrganization(String orgname) throws JAXRException
+ {
+ Organization org = blm.createOrganization(getIString(orgname));
+ org.setDescription(getIString("JBoss Inc"));
+ Service service = blm.createService(getIString("JBOSS JAXR Service"));
+ service.setDescription(getIString("Services of XML Registry"));
+ //Create serviceBinding
+ ServiceBinding serviceBinding = blm.createServiceBinding();
+ serviceBinding.setDescription(blm.createInternationalString("Service Binding"));
+
+ //Turn validation of URI off
+ serviceBinding.setValidateURI(false);
+ serviceBinding.setAccessURI("http://testjboss.org");
+
+ // Add the serviceBinding to the service
+ service.addServiceBinding(serviceBinding);
+
+ User user = blm.createUser();
+ org.setPrimaryContact(user);
+ PersonName personName = blm.createPersonName("Anil S");
+ TelephoneNumber telephoneNumber = blm.createTelephoneNumber();
+ telephoneNumber.setNumber("111-111-7777");
+ telephoneNumber.setType(null);
+ PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", "");
+ Collection postalAddresses = new ArrayList();
+ postalAddresses.add(address);
+ Collection emailAddresses = new ArrayList();
+ EmailAddress emailAddress = blm.createEmailAddress("anil(a)apache.org");
+ emailAddresses.add(emailAddress);
+
+ Collection numbers = new ArrayList();
+ numbers.add(telephoneNumber);
+ user.setPersonName(personName);
+ user.setPostalAddresses(postalAddresses);
+ user.setEmailAddresses(emailAddresses);
+ user.setTelephoneNumbers(numbers);
+
+ ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", "");
+ Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2");
+ cScheme.setKey(cKey);
+ Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415");
+ org.addClassification(classification);
+ ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", "");
+ Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423");
+ cScheme1.setKey(cKey1);
+ ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849");
+ org.addExternalIdentifier(ei);
+ org.addService(service);
+ return org;
+ }
+
+ /**
+ * Delete an Organization with a given key
+ */
+ protected void deleteOrganization(Key orgkey) throws Exception
+ {
+ assertNotNull("Org Key is null?", orgkey);
+ if (blm == null)
+ blm = this.getBusinessLifeCycleManager();
+ Collection keys = new ArrayList();
+ keys.add(orgkey);
+
+ BulkResponse response = blm.deleteOrganizations(keys);
+ Collection exceptions = response.getExceptions();
+ assertNull("Deleting Org with Key=" + orgkey, exceptions);
+ }
+
+ private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException
+ {
+ ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2));
+ return cs;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-05-28 14:36:10 UTC (rev 7195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-05-29 07:09:24 UTC (rev 7196)
@@ -1,383 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
-package org.jboss.test.ws.jaxws.samples.jaxr.scout;
-
-import java.net.PasswordAuthentication;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.xml.registry.BulkResponse;
-import javax.xml.registry.BusinessLifeCycleManager;
-import javax.xml.registry.BusinessQueryManager;
-import javax.xml.registry.Connection;
-import javax.xml.registry.ConnectionFactory;
-import javax.xml.registry.FindQualifier;
-import javax.xml.registry.JAXRException;
-import javax.xml.registry.RegistryService;
-import javax.xml.registry.infomodel.Classification;
-import javax.xml.registry.infomodel.ClassificationScheme;
-import javax.xml.registry.infomodel.EmailAddress;
-import javax.xml.registry.infomodel.ExternalIdentifier;
-import javax.xml.registry.infomodel.InternationalString;
-import javax.xml.registry.infomodel.Key;
-import javax.xml.registry.infomodel.LocalizedString;
-import javax.xml.registry.infomodel.Organization;
-import javax.xml.registry.infomodel.PersonName;
-import javax.xml.registry.infomodel.PostalAddress;
-import javax.xml.registry.infomodel.RegistryObject;
-import javax.xml.registry.infomodel.Service;
-import javax.xml.registry.infomodel.ServiceBinding;
-import javax.xml.registry.infomodel.TelephoneNumber;
-import javax.xml.registry.infomodel.User;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.common.ObjectNameFactory;
-
-/**
- * Acts as the base class for Jaxr Test Cases
- *
- * @author Anil.Saldhana(a)jboss.org
- * @author Thomas.Diesler(a)jboss.com
- * @since 29-Dec-2004
- */
-public class JaxrBaseTest extends JBossWSTest
-{
- protected String userid = "jboss";
- protected String passwd = "jboss";
- protected BusinessLifeCycleManager blm = null;
- protected RegistryService rs = null;
- protected BusinessQueryManager bqm = null;
- protected Connection connection = null;
- protected BulkResponse br = null;
- protected MBeanServerConnection server = null;
-
- protected ConnectionFactory factory = null;
-
- protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi");
-
- /**
- * Setup of the JUnit test
- * We create the juddi tables on startup
- *
- * @throws Exception
- */
- protected void setUp() throws Exception
- {
- //Change the createonstart setting for juddi service and restart it
- server = getServer();
- server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() });
- server.invoke(OBJECT_NAME, "stop", null, null);
- server.invoke(OBJECT_NAME, "start", null, null);
-
- //Ensure that the Jaxr Connection Factory class is setup
- String factoryString = "javax.xml.registry.ConnectionFactoryClass";
- String factoryClass = System.getProperty(factoryString);
- if (factoryClass == null || factoryClass.length() == 0)
- System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl");
-
- String queryurl = System.getProperty("jaxr.query.url", "http://" + getServerHost() + ":8080/juddi/inquiry");
- String puburl = System.getProperty("jaxr.publish.url", "http://" + getServerHost() + ":8080/juddi/publish");
-
- Properties props = new Properties();
- props.setProperty("javax.xml.registry.queryManagerURL", queryurl);
- props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl);
-
- String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport");
- System.setProperty("juddi.proxy.transportClass", transportClass);
-
- // Create the connection, passing it the configuration properties
- factory = ConnectionFactory.newInstance();
- factory.setProperties(props);
- connection = factory.createConnection();
- }
-
- /**
- * Teardown of the junit test
- * We discard all the tables created by the juddi service
- *
- * @throws Exception
- */
- protected void tearDown() throws Exception
- {
- if (connection != null)
- connection.close();
-
- //stop the juddi service so that all the tables are dropped
- server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() });
- server.invoke(OBJECT_NAME, "stop", null, null);
- }
-
- /**
- * Does authentication with the uddi registry
- */
- protected void login() throws JAXRException
- {
- PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray());
- Set creds = new HashSet();
- creds.add(passwdAuth);
-
- connection.setCredentials(creds);
- }
-
- protected void getJAXREssentials() throws JAXRException
- {
- rs = connection.getRegistryService();
- blm = rs.getBusinessLifeCycleManager();
- bqm = rs.getBusinessQueryManager();
- }
-
- public InternationalString getIString(String str) throws JAXRException
- {
- return blm.createInternationalString(str);
- }
-
- /**
- * Locale aware Search a business in the registry
- */
- public void searchBusiness(String bizname) throws JAXRException
- {
- try
- {
- // Get registry service and business query manager
- this.getJAXREssentials();
-
- // Define find qualifiers and name patterns
- Collection findQualifiers = new ArrayList();
- findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
- Collection namePatterns = new ArrayList();
- String pattern = "%" + bizname + "%";
- LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern);
- namePatterns.add(ls);
-
- // Find based upon qualifier type and values
- BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null);
-
- // check how many organisation we have matched
- Collection orgs = response.getCollection();
- if (orgs == null)
- {
- log.debug(" -- Matched 0 orgs");
-
- }
- else
- {
- log.debug(" -- Matched " + orgs.size() + " organizations -- ");
-
- // then step through them
- for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();)
- {
- Organization org = (Organization)orgIter.next();
- log.debug("Org name: " + getName(org));
- log.debug("Org description: " + getDescription(org));
- log.debug("Org key id: " + getKey(org));
- checkUser(org);
- checkServices(org);
- }
- }
- }
- finally
- {
- connection.close();
- }
-
- }
-
- protected RegistryService getRegistryService() throws JAXRException
- {
- assertNotNull(connection);
- return connection.getRegistryService();
- }
-
- protected BusinessQueryManager getBusinessQueryManager() throws JAXRException
- {
- assertNotNull(connection);
- if (rs == null)
- rs = this.getRegistryService();
- return rs.getBusinessQueryManager();
- }
-
- protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException
- {
- assertNotNull(connection);
- if (rs == null)
- rs = this.getRegistryService();
- return rs.getBusinessLifeCycleManager();
- }
-
- private void checkServices(Organization org) throws JAXRException
- {
- // Display service and binding information
- Collection services = org.getServices();
- for (Iterator svcIter = services.iterator(); svcIter.hasNext();)
- {
- Service svc = (Service)svcIter.next();
- log.debug(" Service name: " + getName(svc));
- log.debug(" Service description: " + getDescription(svc));
-
- assertEquals("JBOSS JAXR Service", getName(svc));
- assertEquals("Services of XML Registry", getDescription(svc));
-
- Collection serviceBindings = svc.getServiceBindings();
- for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();)
- {
- ServiceBinding sb = (ServiceBinding)sbIter.next();
- log.debug(" Binding Description: " + getDescription(sb));
- log.debug(" Access URI: " + sb.getAccessURI());
- assertEquals("http://testjboss.org", sb.getAccessURI());
- assertEquals("Service Binding", getDescription(sb));
- }
- }
- }
-
- private void checkUser(Organization org) throws JAXRException
- {
- // Display primary contact information
- User pc = org.getPrimaryContact();
- if (pc != null)
- {
- PersonName pcName = pc.getPersonName();
- log.debug(" Contact name: " + pcName.getFullName());
- assertEquals("Anil S", pcName.getFullName());
- Collection phNums = pc.getTelephoneNumbers(pc.getType());
- for (Iterator phIter = phNums.iterator(); phIter.hasNext();)
- {
- TelephoneNumber num = (TelephoneNumber)phIter.next();
- log.debug(" Phone number: " + num.getNumber());
- }
- Collection eAddrs = pc.getEmailAddresses();
- for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();)
- {
- log.debug(" Email Address: " + (EmailAddress)eaIter.next());
- }
- }
- }
-
- private static String getName(RegistryObject ro) throws JAXRException
- {
- if (ro != null && ro.getName() != null)
- {
- return ro.getName().getValue();
- }
- return "";
- }
-
- private static String getDescription(RegistryObject ro) throws JAXRException
- {
- if (ro != null && ro.getDescription() != null)
- {
- return ro.getDescription().getValue();
- }
- return "";
- }
-
- private static String getKey(RegistryObject ro) throws JAXRException
- {
- if (ro != null && ro.getKey() != null)
- {
- return ro.getKey().getId();
- }
- return "";
- }
-
- /**
- * Creates a Jaxr Organization with 1 or more services
- */
- protected Organization createOrganization(String orgname) throws JAXRException
- {
- Organization org = blm.createOrganization(getIString(orgname));
- org.setDescription(getIString("JBoss Inc"));
- Service service = blm.createService(getIString("JBOSS JAXR Service"));
- service.setDescription(getIString("Services of XML Registry"));
- //Create serviceBinding
- ServiceBinding serviceBinding = blm.createServiceBinding();
- serviceBinding.setDescription(blm.createInternationalString("Service Binding"));
-
- //Turn validation of URI off
- serviceBinding.setValidateURI(false);
- serviceBinding.setAccessURI("http://testjboss.org");
-
- // Add the serviceBinding to the service
- service.addServiceBinding(serviceBinding);
-
- User user = blm.createUser();
- org.setPrimaryContact(user);
- PersonName personName = blm.createPersonName("Anil S");
- TelephoneNumber telephoneNumber = blm.createTelephoneNumber();
- telephoneNumber.setNumber("111-111-7777");
- telephoneNumber.setType(null);
- PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", "");
- Collection postalAddresses = new ArrayList();
- postalAddresses.add(address);
- Collection emailAddresses = new ArrayList();
- EmailAddress emailAddress = blm.createEmailAddress("anil(a)apache.org");
- emailAddresses.add(emailAddress);
-
- Collection numbers = new ArrayList();
- numbers.add(telephoneNumber);
- user.setPersonName(personName);
- user.setPostalAddresses(postalAddresses);
- user.setEmailAddresses(emailAddresses);
- user.setTelephoneNumbers(numbers);
-
- ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", "");
- Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2");
- cScheme.setKey(cKey);
- Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415");
- org.addClassification(classification);
- ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", "");
- Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423");
- cScheme1.setKey(cKey1);
- ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849");
- org.addExternalIdentifier(ei);
- org.addService(service);
- return org;
- }
-
- /**
- * Delete an Organization with a given key
- */
- protected void deleteOrganization(Key orgkey) throws Exception
- {
- assertNotNull("Org Key is null?", orgkey);
- if (blm == null)
- blm = this.getBusinessLifeCycleManager();
- Collection keys = new ArrayList();
- keys.add(orgkey);
-
- BulkResponse response = blm.deleteOrganizations(keys);
- Collection exceptions = response.getExceptions();
- assertNull("Deleting Org with Key=" + orgkey, exceptions);
- }
-
- private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException
- {
- ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2));
- return cs;
- }
-}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-05-28 14:36:10 UTC (rev 7195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-05-29 07:09:24 UTC (rev 7196)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase;
import javax.xml.registry.BulkResponse;
import javax.xml.registry.JAXRException;
@@ -40,7 +40,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Jan 3, 2005
*/
-public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest
+public class JaxrDeleteOrganizationTestCase extends JaxrAbstractBase
{
public String saveOrg(String orgname) throws JAXRException
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-05-28 14:36:10 UTC (rev 7195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-05-29 07:09:24 UTC (rev 7196)
@@ -31,7 +31,7 @@
import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.Organization;
-import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase;
/**
* Tests Jaxr Save Organization
@@ -40,7 +40,7 @@
* @since Dec 29, 2004
*/
-public class JaxrSaveOrganizationTestCase extends JaxrBaseTest
+public class JaxrSaveOrganizationTestCase extends JaxrAbstractBase
{
private Key orgKey = null;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-05-28 14:36:10 UTC (rev 7195)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-05-29 07:09:24 UTC (rev 7196)
@@ -30,7 +30,7 @@
import java.util.Collection;
import java.util.Iterator;
-import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest;
+import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase;
import javax.xml.registry.BulkResponse;
import javax.xml.registry.JAXRException;
@@ -38,7 +38,7 @@
import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.Organization;
-public class JaxrBusinessQueryTestCase extends JaxrBaseTest
+public class JaxrBusinessQueryTestCase extends JaxrAbstractBase
{
protected String querystr = "JBOSS";
15 years, 11 months
- 1
- 0
JBossWS SVN: r7195 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-28 10:36:10 -0400 (Wed, 28 May 2008)
New Revision: 7195
Modified:
stack/cxf/trunk/.classpath
Log:
Include cxf-tests in eclipse classpath
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2008-05-28 13:52:42 UTC (rev 7194)
+++ stack/cxf/trunk/.classpath 2008-05-28 14:36:10 UTC (rev 7195)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="modules/server/src/main/java"/>
+ <classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/>
<classpathentry kind="src" path="modules/client/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
15 years, 11 months
- 1
- 0
JBossWS SVN: r7194 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-28 09:52:42 -0400 (Wed, 28 May 2008)
New Revision: 7194
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
Log:
[JBWS-2035] Cannot determine variable name for void wrapper
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2008-05-28 13:30:23 UTC (rev 7193)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2008-05-28 13:52:42 UTC (rev 7194)
@@ -795,15 +795,18 @@
throw new WSException("Cannot obtain java/xml type mapping for: " + xmlType);
Map<String, String> map = createVariableMappingMap(javaXmlTypeMapping.getVariableMappings());
- String elementName = returnValueMapping.getWsdlMessagePartName();
- String variable = map.get(elementName);
- if (variable == null)
- throw new IllegalArgumentException("Could not determine variable name for element: " + elementName);
+ if (map.size() > 0)
+ {
+ String elementName = returnValueMapping.getWsdlMessagePartName();
+ String variable = map.get(elementName);
+ if (variable == null)
+ throw new IllegalArgumentException("Could not determine variable name for element: " + elementName);
- String wrappedType = returnValueMapping.getMethodReturnValue();
- QName element = new QName(elementName);
- WrappedParameter wrappedParameter = new WrappedParameter(element, wrappedType, variable, WrappedParameter.RETURN);
- wrappedResponseParameters.add(0, wrappedParameter);
+ String wrappedType = returnValueMapping.getMethodReturnValue();
+ QName element = new QName(elementName);
+ WrappedParameter wrappedParameter = new WrappedParameter(element, wrappedType, variable, WrappedParameter.RETURN);
+ wrappedResponseParameters.add(0, wrappedParameter);
+ }
}
outMetaData.setWrappedParameters(wrappedResponseParameters);
15 years, 11 months
- 1
- 0
JBossWS SVN: r7193 - stack/metro/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-28 09:30:23 -0400 (Wed, 28 May 2008)
New Revision: 7193
Modified:
stack/metro/trunk/src/main/distro/build-deploy.xml
Log:
[JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-05-28 13:08:27 UTC (rev 7192)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-05-28 13:30:23 UTC (rev 7193)
@@ -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}"/>
+ <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
+ <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
</target>
<!-- ================================================================== -->
15 years, 11 months
- 1
- 0
JBossWS SVN: r7192 - in framework/trunk/hudson/hudson-home/jobs: CXF-Integration-AS-5.0.0 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-28 09:08:27 -0400 (Wed, 28 May 2008)
New Revision: 7192
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
Log:
[JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-05-28 13:06:38 UTC (rev 7191)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-05-28 13:08:27 UTC (rev 7192)
@@ -45,8 +45,6 @@
#
# execute tests
#
-# [JBWS-2177] endorsed dirs maven surefire issue
-export MAVEN_OPTS_HOOK=-Djava.endorsed.dirs=$JBOSS_INSTANCE/lib/endorsed
mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-05-28 13:06:38 UTC (rev 7191)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-05-28 13:08:27 UTC (rev 7192)
@@ -45,8 +45,6 @@
#
# execute tests
#
-# [JBWS-2177] endorsed dirs maven surefire issue
-export MAVEN_OPTS_HOOK=-Djava.endorsed.dirs=$JBOSS_INSTANCE/lib/endorsed
mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-05-28 13:06:38 UTC (rev 7191)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-05-28 13:08:27 UTC (rev 7192)
@@ -45,8 +45,6 @@
#
# execute tests
#
-# [JBWS-2177] endorsed dirs maven surefire issue
-export MAVEN_OPTS_HOOK=-Djava.endorsed.dirs=$JBOSS_INSTANCE/lib/endorsed
mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-05-28 13:06:38 UTC (rev 7191)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-05-28 13:08:27 UTC (rev 7192)
@@ -45,8 +45,6 @@
#
# execute tests
#
-# [JBWS-2177] endorsed dirs maven surefire issue
-export MAVEN_OPTS_HOOK=-Djava.endorsed.dirs=$JBOSS_INSTANCE/lib/endorsed
mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
15 years, 11 months
- 1
- 0