JBossWS SVN: r6625 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-23 03:39:57 -0400 (Wed, 23 Apr 2008)
New Revision: 6625
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
fixing JBWS1822 test - BeanImpl wasn't packaged
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-23 07:15:13 UTC (rev 6624)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-23 07:39:57 UTC (rev 6625)
@@ -388,7 +388,7 @@
<!-- jaxws-jbws1822 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar">
<fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/>
</fileset>
</jar>
@@ -400,7 +400,7 @@
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar">
<fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/>
18 years
JBossWS SVN: r6624 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 03:15:13 -0400 (Wed, 23 Apr 2008)
New Revision: 6624
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java
Log:
Fix jaxr test
Modified: 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-04-23 06:49:17 UTC (rev 6623)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-04-23 07:15:13 UTC (rev 6624)
@@ -250,7 +250,7 @@
log.debug(" Binding Description: " + getDescription(sb));
log.debug(" Access URI: " + sb.getAccessURI());
assertEquals("http://testjboss.org", sb.getAccessURI());
- assertEquals(" Service Binding", getDescription(sb));
+ assertEquals("Service Binding", getDescription(sb));
}
}
}
@@ -316,7 +316,7 @@
service.setDescription(getIString("Services of XML Registry"));
//Create serviceBinding
ServiceBinding serviceBinding = blm.createServiceBinding();
- serviceBinding.setDescription(blm.createInternationalString(" Service Binding"));
+ serviceBinding.setDescription(blm.createInternationalString("Service Binding"));
//Turn validation of URI off
serviceBinding.setValidateURI(false);
18 years
JBossWS SVN: r6623 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 02:49:17 -0400 (Wed, 23 Apr 2008)
New Revision: 6623
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
Fix wsdl-publish
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-23 06:25:32 UTC (rev 6622)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-23 06:49:17 UTC (rev 6623)
@@ -314,7 +314,7 @@
<filter token="java.home" value="${java.home}"/>
<filter token="jboss.bind.address" value="${node0}"/>
<filter token="tests.output.dir" value="${tests.output.dir}"/>
- <filter token="wsdl-publish-location" value="${tests.output.dir}/test-wsdl-publish"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
</filterset>
</copy>
18 years
JBossWS SVN: r6622 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-23 02:25:32 -0400 (Wed, 23 Apr 2008)
New Revision: 6622
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
Add getArchive/Resource to TestSetup
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-22 19:38:25 UTC (rev 6621)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-04-23 06:25:32 UTC (rev 6622)
@@ -119,6 +119,16 @@
return delegate.getServerHost();
}
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getArchiveFile(archive);
+ }
+
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getArchiveFile(archive).toURL();
+ }
+
public File getResourceFile(String resource)
{
return delegate.getResourceFile(resource);
@@ -126,8 +136,7 @@
public URL getResourceURL(String resource) throws MalformedURLException
{
- File file = delegate.getResourceFile(resource);
- return (file != null ? file.toURL() : null);
+ return delegate.getResourceFile(resource).toURL();
}
/** Get the client's env context for a given name.
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-22 19:38:25 UTC (rev 6621)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-23 06:25:32 UTC (rev 6622)
@@ -22,7 +22,6 @@
package org.jboss.wsf.test;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Hashtable;
@@ -50,7 +49,7 @@
private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address";
private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
-
+
private static MBeanServerConnection server;
private static String integrationTarget;
private static String implVendor;
@@ -63,7 +62,7 @@
*/
public void deploy(String archive) throws Exception
{
- URL url = getArchiveURL(archive);
+ URL url = getArchiveFile(archive).toURL();
getDeployer().deploy(url);
}
@@ -71,7 +70,7 @@
*/
public void undeploy(String archive) throws Exception
{
- URL url = getArchiveURL(archive);
+ URL url = getArchiveFile(archive).toURL();
getDeployer().undeploy(url);
}
@@ -203,8 +202,7 @@
jbossVersion = "jboss42";
else if (jbossVersion.startsWith("4.0"))
jbossVersion = "jboss40";
- else
- throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
+ else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
}
catch (Throwable th)
{
@@ -218,24 +216,15 @@
}
/** Try to discover the URL for the deployment archive */
- public URL getArchiveURL(String archive) throws MalformedURLException
+ public File getArchiveFile(String archive)
{
- try
- {
- return (new URL(archive));
- }
- catch (MalformedURLException ignore)
- {
- // ignore
- }
-
File file = new File(archive);
if (file.exists())
- return file.toURL();
+ return file;
file = new File(getTestArchiveDir() + "/" + archive);
if (file.exists())
- return file.toURL();
+ return file;
String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : "");
throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-04-22 19:38:25 UTC (rev 6621)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-04-23 06:25:32 UTC (rev 6622)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.test;
+import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -30,12 +32,12 @@
import javax.management.MBeanServerConnection;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
-
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.logging.Logger;
+
/**
* A test setup that deploys/undeploys archives
*
@@ -46,7 +48,7 @@
{
// provide logging
private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
-
+
private JBossWSTestHelper delegate = new JBossWSTestHelper();
private String[] archives = new String[0];
@@ -67,6 +69,26 @@
super(test);
}
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getArchiveFile(archive);
+ }
+
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getArchiveFile(archive).toURL();
+ }
+
+ public File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return delegate.getResourceFile(resource).toURL();
+ }
+
private void getArchiveArray(String archiveList)
{
if (archiveList != null)
@@ -84,7 +106,7 @@
// verify integration target
String integrationTarget = delegate.getIntegrationTarget();
log.debug("Integration target: " + integrationTarget);
-
+
List clientJars = new ArrayList();
for (int i = 0; i < archives.length; i++)
{
@@ -101,7 +123,7 @@
if (archive.endsWith("-client.jar"))
{
- URL archiveURL = delegate.getArchiveURL(archive);
+ URL archiveURL = getArchiveURL(archive);
clientJars.add(archiveURL);
}
}
@@ -128,7 +150,7 @@
delegate.undeploy(archive);
}
}
-
+
public MBeanServerConnection getServer() throws NamingException
{
return delegate.getServer();
18 years
JBossWS SVN: r6620 - in stack/cxf/branches/tdiesler/trunk: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-22 12:36:15 -0400 (Tue, 22 Apr 2008)
New Revision: 6620
Modified:
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
Log:
assembly
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 15:29:05 UTC (rev 6619)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 16:36:15 UTC (rev 6620)
@@ -16,6 +16,13 @@
<version>1.0-SNAPSHOT</version>
</parent>
+ <!-- Modules -->
+ <modules>
+ <module>modules/management</module>
+ <module>modules/server</module>
+ <module>modules/client</module>
+ </modules>
+
<!-- Properties -->
<properties>
<cxf.version>2.0.5-incubator</cxf.version>
@@ -33,14 +40,6 @@
<saaj.api.version>1.3</saaj.api.version>
</properties>
- <!-- Modules -->
- <modules>
- <module>modules/management</module>
- <module>modules/server</module>
- <module>modules/client</module>
- <!--module>modules/testsuite</module-->
- </modules>
-
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
@@ -209,6 +208,12 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 15:29:05 UTC (rev 6619)
+++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 16:36:15 UTC (rev 6620)
@@ -1,10 +1,44 @@
<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
<id>deploy-structure-jboss422</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+
+ <!-- bin -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+
+ <!-- server/default/lib -->
+ <!--
+ outputFileNameMapping in dependencySet uses pom's artifactid
+ http://jira.codehaus.org/browse/MASSEMBLY-315
+ <dependencySet>
+ <outputDirectory>server/default/lib</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:saaj-api:jar</include>
+ </includes>
+ </dependencySet>
+ -->
+ </dependencySets>
+
<moduleSets>
<!-- client -->
<moduleSet>
@@ -23,55 +57,67 @@
<include>*:cxf-*</include>
<include>*:geronimo-javamail*</include>
<include>*:geronimo-ws-metadata*</include>
- <include>*:jaxb-api*</include>
- <include>*:jaxb-impl*</include>
- <include>*:jaxb-xjc*</include>
- <include>*:jaxws-api*</include>
- <include>*:jbossws-common*</include>
- <include>*:jbossws-framework*</include>
- <include>*:jbossws-spi*</include>
- <include>*:neethi*</include>
- <include>*:saaj-api*</include>
- <include>*:saaj-impl*</include>
- <include>*:spring-beans*</include>
- <include>*:spring-context*</include>
- <include>*:spring-core*</include>
- <include>*:stax-api*</include>
- <include>*:wsdl4j*</include>
- <include>*:xml-resolver*</include>
- <include>*:XmlSchema*</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:neethi:jar</include>
+ <include>*:saaj-api:jar</include>
+ <include>*:saaj-impl:jar</include>
+ <include>*:spring-beans:jar</include>
+ <include>*:spring-context:jar</include>
+ <include>*:spring-core:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:xml-resolver:jar</include>
+ <include>*:XmlSchema:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:wstx*</include>
+ <include>*:wstx-asl:jar</include>
</includes>
</dependencySet>
</dependencySets>
</binaries>
</moduleSet>
- <!-- server/default/deploy/jbossws.sar -->
+
+ <!-- server/default/lib -->
<moduleSet>
<includes>
<include>org.jboss.ws:jbossws-cxf-client</include>
</includes>
<binaries>
- <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <outputDirectory>server/default/lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
+ <!--
+ useProjectArtifact is documented but not in schema
+ http://jira.codehaus.org/browse/MASSEMBLY-316
+ <useProjectArtifact>false</useProjectArtifact>
+ -->
<includes>
- <include>*:cxf-*</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:saaj-api:jar</include>
</includes>
</dependencySet>
</dependencySets>
</binaries>
</moduleSet>
+
+ <!-- server/default/deploy/jbossws.sar -->
<moduleSet>
<includes>
<include>org.jboss.ws:jbossws-cxf-server</include>
@@ -106,52 +152,33 @@
</moduleSet>
<moduleSet>
<includes>
- <include>org.jboss.ws:jbossws-cxf-management</include>
+ <include>org.jboss.ws:jbossws-cxf-client</include>
</includes>
<binaries>
- <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- <!-- server/default/lib -->
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-server</include>
- </includes>
- <binaries>
- <outputDirectory>server/default/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jaxws-api*</include>
- <include>*:jbossws-common*</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi*</include>
- <include>*:saaj-api*</include>
+ <include>*:cxf-*</include>
</includes>
</dependencySet>
</dependencySets>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
</moduleSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>server/default/lib2</outputDirectory>
- <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>false</unpack>
- <includes>
- <include>javax.xml.soap:saaj-api:jar</include>
- <include>javax.xml.ws:jaxws-api:jar</include>
- <include>org.jboss.ws:jbossws-common:jar</include>
- <include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-spi:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
+
</assembly>
\ No newline at end of file
18 years
JBossWS SVN: r6615 - in stack/cxf/branches/tdiesler/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-22 11:28:45 -0400 (Tue, 22 Apr 2008)
New Revision: 6615
Modified:
stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/profiles-example.xml
stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
Log:
profilesXml http://maven.apache.org/xsd/profiles-1.0.0.xsd
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-22 14:36:26 UTC (rev 6614)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-22 15:28:45 UTC (rev 6615)
@@ -60,10 +60,10 @@
</patternset>
<patternset id="jbossws.server.lib.patternset">
+ <include name="**/jaxws-api.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jaxws-api.jar"/>
<include name="**/saaj-api.jar"/>
</patternset>
@@ -83,7 +83,6 @@
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
<include name="**/wsdl4j.jar"/>
- <include name="**/xbean.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
</patternset>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 14:36:26 UTC (rev 6614)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 15:28:45 UTC (rev 6615)
@@ -28,6 +28,9 @@
<juddi.service.version>1.2.0.GA</juddi.service.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxrpc.api.version>1.1</jaxrpc.api.version>
+ <jaxws.api.version>2.0</jaxws.api.version>
+ <saaj.api.version>1.3</saaj.api.version>
</properties>
<!-- Modules -->
@@ -143,10 +146,19 @@
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <version>${jaxrpc.api.version}</version>
</dependency>
<dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${saaj.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
@@ -185,25 +197,43 @@
</dependencies>
</dependencyManagement>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ </dependencies>
+
<!-- Plugins -->
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
+ <finalName>deploy-structure-jboss422</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>scripts/assembly-install-jboss422.xml</descriptor>
</descriptors>
</configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>install</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-22 14:36:26 UTC (rev 6614)
+++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-22 15:28:45 UTC (rev 6615)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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">
<!-- This profile can also be defined in ~/.m2/settings.xml -->
<profiles>
@@ -19,4 +19,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</profilesXml>
\ No newline at end of file
Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 14:36:26 UTC (rev 6614)
+++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 15:28:45 UTC (rev 6615)
@@ -6,14 +6,152 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<moduleSets>
+ <!-- client -->
<moduleSet>
<includes>
<include>org.jboss.ws:jbossws-cxf-client</include>
</includes>
<binaries>
- <outputDirectory>modules/${artifactId}</outputDirectory>
+ <outputDirectory>client</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:cxf-*</include>
+ <include>*:geronimo-javamail*</include>
+ <include>*:geronimo-ws-metadata*</include>
+ <include>*:jaxb-api*</include>
+ <include>*:jaxb-impl*</include>
+ <include>*:jaxb-xjc*</include>
+ <include>*:jaxws-api*</include>
+ <include>*:jbossws-common*</include>
+ <include>*:jbossws-framework*</include>
+ <include>*:jbossws-spi*</include>
+ <include>*:neethi*</include>
+ <include>*:saaj-api*</include>
+ <include>*:saaj-impl*</include>
+ <include>*:spring-beans*</include>
+ <include>*:spring-context*</include>
+ <include>*:spring-core*</include>
+ <include>*:stax-api*</include>
+ <include>*:wsdl4j*</include>
+ <include>*:xml-resolver*</include>
+ <include>*:XmlSchema*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</binaries>
</moduleSet>
+ <!-- server/default/deploy/jbossws.sar -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:cxf-*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:cxf-*</include>
+ <include>*:geronimo-javamail*</include>
+ <include>*:geronimo-ws-metadata*</include>
+ <include>*:jaxrpc-api*</include>
+ <include>*:jaxws-api*</include>
+ <include>*:neethi*</include>
+ <include>*:saaj-api*</include>
+ <include>*:saaj-impl*</include>
+ <include>*:spring-beans*</include>
+ <include>*:spring-context*</include>
+ <include>*:spring-core*</include>
+ <include>*:wsdl4j*</include>
+ <include>*:xml-resolver*</include>
+ <include>*:XmlSchema*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <!-- server/default/lib -->
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-cxf-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>server/default/lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jaxws-api*</include>
+ <include>*:jbossws-common*</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi*</include>
+ <include>*:saaj-api*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
</moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>server/default/lib2</outputDirectory>
+ <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>javax.xml.soap:saaj-api:jar</include>
+ <include>javax.xml.ws:jaxws-api:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-framework:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
18 years