JBossWS SVN: r6464 - in container/jboss42/branches/jbossws-jboss422/src/main: resources and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 06:24:39 -0400 (Thu, 17 Apr 2008)
New Revision: 6464
Modified:
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
Log:
Fix Ejb3 deployment errors and EndpoitnAPI calls
Modified: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 09:39:24 UTC (rev 6463)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 10:24:39 UTC (rev 6464)
@@ -22,6 +22,8 @@
package org.jboss.wsf.container.jboss42;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
//$Id$
@@ -33,5 +35,20 @@
*/
public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
{
-
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+ {
+ super.deploy(unit); // Calls create
+
+ log.debug("deploy: " + unit.shortName);
+ Deployment dep = getDeployment(unit);
+ if (dep == null || (dep.getState() != Deployment.DeploymentState.CREATED) )
+ throw new DeploymentException("Create step failed");
+
+ getRuntime().start(dep);
+
+ unit.context.put(Deployment.class, dep);
+ }
+ }
}
Modified: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 09:39:24 UTC (rev 6463)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 10:24:39 UTC (rev 6464)
@@ -23,11 +23,8 @@
//$Id$
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3ModuleMBean;
import org.jboss.ejb3.mdb.MessagingContainer;
@@ -35,10 +32,13 @@
import org.jboss.wsf.common.URLLoaderAdapter;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+
/**
* A deployer JAXWS EJB3 Endpoints
*
@@ -121,17 +121,4 @@
return isWebServiceBean;
}
-
- public void deploy(DeploymentInfo unit) throws DeploymentException
- {
- super.deploy(unit);
-
- Deployment dep = getDeployment(unit);
- if (dep == null)
- {
- throw new IllegalStateException("Deployment missing in start phase");
- }
-
- getRuntime().start(dep);
- }
}
Modified: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 09:39:24 UTC (rev 6463)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 10:24:39 UTC (rev 6464)
@@ -7,7 +7,9 @@
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
<!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer">
+ <property name="runtimeName">EndpointAPIRuntime</property>
+ </bean>
<!-- Bind Service objects in client environment context -->
<bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
16 years, 9 months
JBossWS SVN: r6463 - framework/trunk/framework/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 05:39:24 -0400 (Thu, 17 Apr 2008)
New Revision: 6463
Modified:
framework/trunk/framework/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
Lessen constraints on DefaultEndpoint ctor
Modified: framework/trunk/framework/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/trunk/framework/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-04-17 09:37:37 UTC (rev 6462)
+++ framework/trunk/framework/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-04-17 09:39:24 UTC (rev 6463)
@@ -63,8 +63,8 @@
DefaultEndpoint(String targetBean)
{
- if(null==targetBean)
- throw new IllegalArgumentException("targetBean name cannot be null");
+ //if(null==targetBean)
+ // throw new IllegalArgumentException("targetBean name cannot be null");
this.targetBean = targetBean;
this.state = EndpointState.UNDEFINED;
16 years, 9 months
JBossWS SVN: r6462 - in container/jboss42/branches/jbossws-jboss423/src/main: resources and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 05:37:37 -0400 (Thu, 17 Apr 2008)
New Revision: 6462
Modified:
container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml
Log:
Fix remaining EJb3 deployment errors
Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 09:37:37 UTC (rev 6462)
@@ -22,16 +22,36 @@
package org.jboss.wsf.container.jboss42;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
//$Id$
/**
- * An abstract deployer for EJB Endpoints
+ * An abstract deployer for EJB Endpoints.
+ * Enganges the START lifecylcle of an endpoint.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 25-Apr-2007
*/
public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
{
-
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+ {
+ super.deploy(unit); // Calls create
+
+ log.debug("deploy: " + unit.shortName);
+ Deployment dep = getDeployment(unit);
+ if (dep == null || (dep.getState() != Deployment.DeploymentState.CREATED) )
+ throw new DeploymentException("Create step failed");
+
+ getRuntime().start(dep);
+
+ unit.context.put(Deployment.class, dep);
+ }
+ }
}
Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-04-17 09:37:37 UTC (rev 6462)
@@ -43,6 +43,9 @@
* A deployer JAXRPC JSE Endpoints
*
* @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
+ * @see org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect#create(org.jboss.wsf.spi.deployment.Deployment, org.jboss.wsf.spi.WSFRuntime)
* @since 25-Apr-2007
*/
public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
@@ -101,7 +104,8 @@
ClassLoader loader = dep.getInitialClassLoader();
Class<?> epBean = loader.loadClass(servletClass.trim());
- // If this is a servlet we defer the the bean creation
+ // If this is a servlet we defer the the bean creation
+ // See ModifyWebMetaDataDeploymentAspect#create(Deployment dep, WSFRuntime runtime)
if (javax.servlet.Servlet.class.isAssignableFrom(epBean))
servletClass = null;
}
Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 09:37:37 UTC (rev 6462)
@@ -120,18 +120,4 @@
}
return isWebServiceBean;
}
-
-
- public void deploy(DeploymentInfo unit) throws DeploymentException
- {
- super.deploy(unit);
-
- Deployment dep = getDeployment(unit);
- if (dep == null)
- {
- throw new IllegalStateException("Deployment missing in start phase");
- }
-
- getRuntime().start(dep);
- }
}
\ No newline at end of file
Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-04-17 09:37:37 UTC (rev 6462)
@@ -23,10 +23,10 @@
//$Id$
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that modifies the web.xml meta data
Modified: container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 09:37:37 UTC (rev 6462)
@@ -7,7 +7,9 @@
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
<!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer">
+ <property name="runtimeName">EndpointAPIRuntime</property>
+ </bean>
<!-- Bind Service objects in client environment context -->
<bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
16 years, 9 months
JBossWS SVN: r6461 - in framework/trunk: framework and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 04:38:57 -0400 (Thu, 17 Apr 2008)
New Revision: 6461
Modified:
framework/trunk/.classpath
framework/trunk/framework/pom.xml
Log:
Fix dependency scope
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-17 08:23:30 UTC (rev 6460)
+++ framework/trunk/.classpath 2008-04-17 08:38:57 UTC (rev 6461)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="framework/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
@@ -13,5 +13,6 @@
<classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR8/jbossxb-2.0.0.CR8.jar"/>
<classpathentry kind="output" path="framework/target/eclipse"/>
</classpath>
Modified: framework/trunk/framework/pom.xml
===================================================================
--- framework/trunk/framework/pom.xml 2008-04-17 08:23:30 UTC (rev 6460)
+++ framework/trunk/framework/pom.xml 2008-04-17 08:38:57 UTC (rev 6461)
@@ -29,6 +29,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<version>1.1</version>
@@ -41,6 +47,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<version>${jbossws-common}</version>
@@ -51,6 +63,12 @@
<version>${jbossws-spi}</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.0.CR8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>tjws</groupId>
<artifactId>webserver</artifactId>
<version>1.3.3</version>
@@ -61,6 +79,14 @@
<artifactId>wsdl4j</artifactId>
<version>1.6.1</version>
</dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
16 years, 9 months
JBossWS SVN: r6460 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 04:23:30 -0400 (Thu, 17 Apr 2008)
New Revision: 6460
Modified:
common/trunk/pom.xml
Log:
Fix dependency scope
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-04-17 07:58:45 UTC (rev 6459)
+++ common/trunk/pom.xml 2008-04-17 08:23:30 UTC (rev 6460)
@@ -14,15 +14,32 @@
<!-- Properties -->
<properties>
- <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+ <jbossws.spi>3.0.0-SNAPSHOT</jbossws.spi>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.0.Beta4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>${jbossws-spi}</version>
+ <version>${jbossws.spi}</version>
</dependency>
</dependencies>
16 years, 9 months
JBossWS SVN: r6459 - stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-17 03:58:45 -0400 (Thu, 17 Apr 2008)
New Revision: 6459
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
Log:
[JBWS-2153] fixing issue
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2008-04-16 18:31:02 UTC (rev 6458)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2008-04-17 07:58:45 UTC (rev 6459)
@@ -534,8 +534,9 @@
fname = fname.replace('/', '_');
fname = fname.replace(':', '_');
- File file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir);
- return file;
+ fname = fname.replace('?', '_');
+
+ return File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir);
}
/**
16 years, 9 months
JBossWS SVN: r6458 - in stack/cxf/trunk: ant-import and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-16 14:31:02 -0400 (Wed, 16 Apr 2008)
New Revision: 6458
Modified:
stack/cxf/trunk/ant-import/build-prepare-deploy.xml
stack/cxf/trunk/ant-import/build-setup.xml
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
stack/cxf/trunk/build.xml
stack/cxf/trunk/cxf-trunk.iml
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
stack/cxf/trunk/version.properties
Log:
Update to SPI 3.0-SNAPSHOT
Modified: stack/cxf/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-prepare-deploy.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/ant-import/build-prepare-deploy.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -31,6 +31,9 @@
<patternset refid="jbossws.service.lib.patternset"/>
<exclude name="cxf-${cxf.version}.jar"/>
<include name="juddi-service.sar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50-container.jar"/>
</fileset>
<fileset dir="${cxf.output.lib.dir}">
<patternset refid="jbossws.client.patternset"/>
@@ -47,6 +50,7 @@
<include name="jbossws-cxf50-beans.xml"/>
<include name="jbossws-jboss42.sar/**"/>
<include name="jbossws-cxf.sar/**"/>
+ <include name="jbossws-deployer-beans.xml"/>
</fileset>
</copy>
</target>
Modified: stack/cxf/trunk/ant-import/build-setup.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-setup.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/ant-import/build-setup.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -61,8 +61,28 @@
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
-
- <condition property="jbossws.integration.jboss42" value="true">
+
+ <condition property="jbossws.integration.jboss421" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss422" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss423" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss500" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss501" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -49,18 +49,40 @@
<!--
thirdpartry-get
-->
- <target name="thirdparty-get" depends="thirdparty-delete,cxf-copy-jars" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
+ <target name="get422-jars" if="jbossws.integration.jboss422">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="get423-jars" if="jbossws.integration.jboss423">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="get501-jars" if="jbossws.integration.jboss501">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="thirdparty-get" depends="thirdparty-delete,cxf-copy-jars, get422-jars, get423-jars, get501-jars"
+ if="force.thirdparty.get" description="Gets the thirdparty libraries">
+
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.jar" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
Modified: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -137,6 +137,48 @@
</copy>
</sequential>
</macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss50-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
@@ -171,6 +213,19 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
@@ -188,6 +243,20 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-server-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
@@ -268,13 +337,17 @@
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
</target>
<target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/build.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -100,33 +100,40 @@
</target>
<!-- Compile resource files -->
- <target name="compile-resources" depends="init">
+ <target name="compile42-resources" if="jbossws.integration.jboss42">
+ <mkdir dir="${cxf.output.resources.dir}"/>
+ <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+ </header>
+ <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
+ <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ </target>
+ <target name="compile50-resources" if="jbossws.integration.jboss50">
+ <mkdir dir="${cxf.output.resources.dir}"/>
+ <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${cxf.output.resources.dir}"/>
+
+ <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0">
+ </header>
+ <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ </target>
+
+ <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
- <!-- Concat jbossws-cxf50-beans.xml -->
<mkdir dir="${cxf.output.resources.dir}"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
<copy todir="${cxf.output.resources.dir}">
<fileset dir="${cxf.resources.dir}">
<include name="jbossws-cxf.sar/**"/>
Modified: stack/cxf/trunk/cxf-trunk.iml
===================================================================
--- stack/cxf/trunk/cxf-trunk.iml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/cxf-trunk.iml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -5,11 +5,1074 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.jra:jra:jar:1.0-alpha-4:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/jra/jra/1.0-alpha-4/jra-1.0-alpha-4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-plugin-api:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-plugin-api/2.0.5/maven-plugin-api-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-context:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.woodstox:wstx-asl:jar:3.2.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/woodstox/wstx-asl/3.2.1/wstx-asl-3.2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.mortbay.jetty:jetty:jar:6.1.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: mx4j:mx4j-remote:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/mx4j/mx4j-remote/3.0.1/mx4j-remote-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.plexus:plexus-utils:jar:1.4.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: rhino:js:jar:1.6R5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R5/js-1.6R5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: mx4j:mx4j:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xml-apis:xml-apis:jar:1.3.04:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-model:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-pool:commons-pool:jar:1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-pool/commons-pool/1.2/commons-pool-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.xbean:xbean-spring:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/xbean/xbean-spring/3.0.1/xbean-spring-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.mortbay.jetty:jetty-util:jar:6.1.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-plugin-api:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:3.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-jmx:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-jmx/2.0.6/spring-jmx-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.easymock:easymockclassextension:jar:2.2.2:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/easymock/easymockclassextension/2.2.2/easymockclassextension-2.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.jra:jra:jar:1.0-alpha-3:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/jra/jra/1.0-alpha-3/jra-1.0-alpha-3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.neethi:neethi:jar:2.0.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/neethi/neethi/2.0.2/neethi-2.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.derby:derby:jar:10.2.2.0:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.1/geronimo-j2ee-connector_1.5_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-beans:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.modules:geronimo-connector:jar:1.2-beta:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/modules/geronimo-connector/1.2-beta/geronimo-connector-1.2-beta.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: wss4j:wss4j:jar:1.5.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xalan:xalan:jar:2.7.0:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-core:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: backport-util-concurrent:backport-util-concurrent:jar:2.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.1/backport-util-concurrent-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jencks:jencks:jar:2.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jencks/jencks/2.0/jencks-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.7.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.soap:saaj-api:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: junit:junit:jar:4.3.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/4.3.1/junit-4.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-mock:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-mock/2.0.6/spring-mock-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.springframework:spring-web:jar:2.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/springframework/spring-web/2.0.6/spring-web-2.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec:jar:1.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.1/geronimo-j2ee-management_1.0_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: regexp:regexp:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/regexp/regexp/1.3/regexp-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-servlet_2.5_spec:jar:1.1-M1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-servlet_2.5_spec/1.1-M1/geronimo-servlet_2.5_spec-1.1-M1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.3.1:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.3.1/slf4j-api-1.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-logging:commons-logging:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-qname_1.1_spec:jar:1.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-qname_1.1_spec/1.1/geronimo-qname_1.1_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven.wagon:wagon-provider-api:jar:1.0-alpha-6:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.xbean:xbean-classloader:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/xbean/xbean-classloader/3.0.1/xbean-classloader-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.servicemix:servicemix-core:jar:3.1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/servicemix/servicemix-core/3.1.2/servicemix-core-3.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-project:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: ant:ant:jar:1.6.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-model:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1/geronimo-jms_1.1_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xerces:xercesImpl:jar:2.8.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.jettison:jettison:jar:1.0-RC2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: jaxme:jaxme2:jar:0.5.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jaxme/jaxme2/0.5.1/jaxme2-0.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.easymock:easymock:jar:2.2:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xmlbeans:xbean:jar:2.2.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xmlbeans/xbean/2.2.0/xbean-2.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-artifact-manager:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: net.java.dev.stax-utils:stax-utils:jar:20060502:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/java/dev/stax-utils/stax-utils/20060502/stax-utils-20060502.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="spi" />
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-project:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.ws.commons.schema:XmlSchema:jar:1.3.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ws/commons/schema/XmlSchema/1.3.2/XmlSchema-1.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.servicemix:servicemix-jbi:jar:3.1.2:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/servicemix/servicemix-jbi/3.1.2/servicemix-jbi-3.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: asm:asm-all:jar:20070324:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm-all/20070324/asm-all-20070324.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.activemq:activemq-core:jar:4.1.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/activemq/activemq-core/4.1.1/activemq-core-4.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-artifact:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: bouncycastle:bcprov-jdk14:jar:136:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bouncycastle/bcprov-jdk14/136/bcprov-jdk14-136.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.1/geronimo-ws-metadata_2.0_spec-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.objectweb.howl:howl:jar:1.0.1-1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/objectweb/howl/howl/1.0.1-1/howl-1.0.1-1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-profile:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: wsdl4j:wsdl4j:jar:1.6.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.activemq:activeio-core:jar:3.0.0-incubator:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/activemq/activeio-core/3.0.0-incubator/activeio-core-3.0.0-incubator.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.0-M1/geronimo-javamail_1.4_spec-1.0-M1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: velocity:velocity-dep:jar:1.4:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/velocity/velocity-dep/1.4/velocity-dep-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: jaxen:jaxen:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jaxen/jaxen/1.1/jaxen-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-jacc_1.0_spec/1.1/geronimo-j2ee-jacc_1.0_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.xbean:xbean-server:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/xbean/xbean-server/3.0.1/xbean-server-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.mojo:shade-maven-plugin:jar:1.0-alpha-6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/mojo/shade-maven-plugin/1.0-alpha-6/shade-maven-plugin-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: aopalliance:aopalliance:jar:1.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xml-apis:xml-apis:jar:1.3.02:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-artifact:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-repository-metadata:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xml-security:xmlsec:jar:1.3.0:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: httpunit:httpunit:jar:1.6.1:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/httpunit/httpunit/1.6.1/httpunit-1.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.modules:geronimo-transaction:jar:1.2-beta:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/modules/geronimo-transaction/1.2-beta/geronimo-transaction-1.2-beta.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1/geronimo-annotation_1.0_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.3.1:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.3.1/slf4j-jdk14-1.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xml-resolver:xml-resolver:jar:1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-activation_1.0.2_spec:jar:1.2:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-activation_1.0.2_spec/1.2/geronimo-activation_1.0.2_spec-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: xstream:xstream:jar:1.1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/xstream/xstream/1.1.2/xstream-1.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.0.5/jaxb-impl-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.codehaus.plexus:plexus-utils:jar:1.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-lang:commons-lang:jar:2.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.xbean:xbean-kernel:jar:3.0.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/xbean/xbean-kernel/3.0.1/xbean-kernel-3.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.1/geronimo-jta_1.0.1B_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.sun.xml.bind:jaxb-xjc:jar:2.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/bind/jaxb-xjc/2.0/jaxb-xjc-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.servicemix:servicemix-services:jar:3.1.2:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/servicemix/servicemix-services/3.1.2/servicemix-services-3.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-dbcp:commons-dbcp:jar:1.2:runtime">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-dbcp/commons-dbcp/1.2/commons-dbcp-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: asm:asm:jar:2.2.3:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm/2.2.3/asm-2.2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: classworlds:classworlds:jar:1.1-alpha-2:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-settings:jar:2.0.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.ws:jaxws-api:jar:2.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/ws/jaxws-api/2.0/jaxws-api-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0-M1/geronimo-activation_1.1_spec-1.0-M1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: velocity:velocity:jar:1.4:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/velocity/velocity/1.4/velocity-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: cglib:cglib-nodep:jar:2.1_3:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-repository-metadata:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.servlet:servlet-api:jar:2.3:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/messaging/saaj/saaj-impl/1.3/saaj-impl-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: ant:ant-nodeps:jar:1.6.5:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-artifact-manager:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.1/geronimo-ejb_2.1_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: jdom:jdom:jar:1.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jdom/jdom/1.0/jdom-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-profile:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.maven:maven-settings:jar:2.0.4:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="framework" />
<orderEntryProperties />
</component>
</module>
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-16 18:31:02 UTC (rev 6458)
@@ -34,6 +34,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
@@ -61,8 +62,7 @@
this.invokerJSE = invokerJSE;
}
- @Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
// Look for cxf.xml descriptor
ClassLoader initCL = dep.getInitialClassLoader();
@@ -139,8 +139,7 @@
}
}
- @Override
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
DDBeans dd = dep.getAttachment(DDBeans.class);
if (dd != null)
Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-04-16 18:31:02 UTC (rev 6458)
@@ -23,11 +23,6 @@
<property name="webServicePort">8080</property>
-->
</bean>
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
@@ -46,6 +41,8 @@
<property name="recording">false</property>
</bean>
+ <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/>
+
<!--
The stack specific deployment aspects
-->
@@ -85,29 +82,19 @@
<!-- Deployment aspect installers -->
<!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSCXFContextPropertiesDeploymentAspect"/>
<inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <!-- phase 2 -->
<inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
<inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
</bean>
<bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-04-16 17:09:47 UTC (rev 6457)
+++ stack/cxf/trunk/version.properties 2008-04-16 18:31:02 UTC (rev 6458)
@@ -31,12 +31,15 @@
cxf.xml.resolver=1.2
cxf.xmlschema=1.3.2
-# Thirdparty library versions
-jbossws-spi=1.0.2.GA
+# Dependend integration projects
+jbossws-spi=3.0.0-SNAPSHOT
jbossws-common=snapshot
-jbossws-framework=snapshot
-jbossws-jboss42=4.2.1.GA
+jbossws-framework=3.0.2-SNAPSHOT
+jbossws-jboss422=4.2.2.DEV
+jbossws-jboss423=4.2.3.DEV
+jbossws-jboss501=5.0.1.DEV
+
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
jboss-common-core=2.0.2.GA
16 years, 9 months
JBossWS SVN: r6457 - in stack/cxf/trunk: src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-16 13:09:47 -0400 (Wed, 16 Apr 2008)
New Revision: 6457
Added:
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml
Modified:
stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
Log:
[JBWS-2097][JBWS-2138] finalizing WS-RM example for CXF based on prepared tutorial
Modified: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-16 12:44:44 UTC (rev 6456)
+++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-16 17:09:47 UTC (rev 6457)
@@ -25,6 +25,9 @@
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
</classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
<zipfileset
dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl"
prefix="WEB-INF/wsdl"/>
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-16 12:44:44 UTC (rev 6456)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-16 17:09:47 UTC (rev 6457)
@@ -21,10 +21,14 @@
*/
package org.jboss.test.ws.jaxws.samples.wsrm.client;
+import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
@@ -38,6 +42,7 @@
{
private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
private SimpleService proxy;
+ private Bus bus;
public static Test suite()
{
@@ -49,11 +54,24 @@
{
super.setUp();
+ SpringBusFactory busFactory = new SpringBusFactory();
+ URL cxfConfig = new File("resources/jaxws/samples/wsrm/wsrm-client-config.xml").toURL();
+ bus = busFactory.createBus(cxfConfig);
+ busFactory.setDefaultBus(bus);
+
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SimpleService)service.getPort(SimpleService.class);
}
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ bus.shutdown(true);
+
+ super.tearDown();
+ }
public void test() throws Exception
{
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2008-04-16 17:09:47 UTC (rev 6457)
@@ -0,0 +1,36 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:wsp='http://www.w3.org/2006/07/ws-policy'
+ xmlns:p='http://cxf.apache.org/policy'
+ xsi:schemaLocation='http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/policy
+ http://cxf.apache.org/schemas/policy.xsd
+ http://www.w3.org/2006/07/ws-policy
+ http://www.w3.org/2006/11/ws-policy.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/>
+ <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/>
+ </wsp:Policy>
+
+ <jaxws:endpoint
+ id='SimpleServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsrm'
+ implementor='org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl'>
+ <jaxws:invoker>
+ <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
+ </jaxws:invoker>
+ <jaxws:features>
+ <p:policies namespace="http://www.w3.org/2006/07/ws-policy">
+ <wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
+ </p:policies>
+ </jaxws:features>
+ </jaxws:endpoint>
+
+</beans>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-16 12:44:44 UTC (rev 6456)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-16 17:09:47 UTC (rev 6457)
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+
+ <wsp:UsingPolicy/>
+ <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/>
+ <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/>
+ </wsp:Policy>
+
<wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm">
<xsd:element name="ping" type="tns:ping"/>
@@ -45,6 +52,7 @@
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService">
+ <wsp:PolicyReference URI="#wsrm10policy"/>
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="ping">
<soap:operation soapAction="" style="document"/>
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2008-04-16 17:09:47 UTC (rev 6457)
@@ -0,0 +1,37 @@
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://schemas.xmlsoap.org/ws/2005/02/rm/policy
+ http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+ http://cxf.apache.org/ws/rm/manager
+ http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ <wsa:addressing/>
+ <wsrm-mgr:reliableMessaging>
+ <wsrm-policy:RMAssertion>
+ <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/>
+ <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>
+ </wsrm-policy:RMAssertion>
+ <wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:acksPolicy intraMessageThreshold="0" />
+ </wsrm-mgr:destinationPolicy>
+ </wsrm-mgr:reliableMessaging>
+ </cxf:features>
+ </cxf:bus>
+
+</beans>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
JBossWS SVN: r6456 - in stack/cxf/trunk: src/test/java/org/jboss/test/ws/jaxws and 11 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-16 08:44:44 -0400 (Wed, 16 Apr 2008)
New Revision: 6456
Added:
stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
stack/cxf/trunk/src/test/resources/jaxws/samples/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
Modified:
stack/cxf/trunk/ant-import-tests/build-testsuite.xml
Log:
[JBWS-2097][JBWS-2138] adding WS-RM example for CXF based on prepared tutorial
Added: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml (rev 0)
+++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,37 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/libs/jaxws-samples-wsrm.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-16 12:12:27 UTC (rev 6455)
+++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-16 12:44:44 UTC (rev 6456)
@@ -88,8 +88,9 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/>
- <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/>
+ <ant antfile="${int.cxf.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
</target>
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,64 @@
+/*
+ * 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.wsrm.client;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+
+/**
+ * Client invoking web service using WS-RM
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class SimpleServiceTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
+ private SimpleService proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (SimpleService)service.getPort(SimpleService.class);
+ }
+
+ public void test() throws Exception
+ {
+ proxy.ping(); // one way call
+ assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,60 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echo">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", propOrder = {
+ "arg0"
+})
+public class Echo {
+
+ protected String arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setArg0(String value) {
+ this.arg0 = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,62 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echoResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", propOrder = {
+ "_return"
+})
+public class EchoResponse {
+
+ @XmlElement(name = "return")
+ protected String _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReturn(String value) {
+ this._return = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,89 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse");
+ private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo");
+ private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link Ping }
+ *
+ */
+ public Ping createPing() {
+ return new Ping();
+ }
+
+ /**
+ * Create an instance of {@link Echo }
+ *
+ */
+ public Echo createEcho() {
+ return new Echo();
+ }
+
+ /**
+ * Create an instance of {@link EchoResponse }
+ *
+ */
+ public EchoResponse createEchoResponse() {
+ return new EchoResponse();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse")
+ public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) {
+ return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo")
+ public JAXBElement<Echo> createEcho(Echo value) {
+ return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping")
+ public JAXBElement<Ping> createPing(Ping value) {
+ return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value);
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,32 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ping complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ping">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping")
+public class Ping {
+
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF (incubator) 2.0.5-incubator
+ * Wed Apr 16 14:19:06 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@WebService(targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "SimpleService")
+
+public interface SimpleService {
+
+ @Oneway
+ @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping")
+ @WebMethod
+ public void ping();
+
+ @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse")
+ @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo")
+ @WebResult(name = "return", targetNamespace = "")
+ @WebMethod
+ public java.lang.String echo(
+ @WebParam(name = "arg0", targetNamespace = "")
+ java.lang.String arg0
+ );
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,58 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+
+/**
+ * This class was generated by Apache CXF (incubator) 2.0.5-incubator
+ * Wed Apr 16 14:19:06 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl")
+public class SimpleService_Service extends Service {
+
+ public final static URL WSDL_LOCATION;
+ public final static QName SERVICE = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
+ public final static QName SimpleServicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort");
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl");
+ } catch (MalformedURLException e) {
+ System.err.println("Can not initialize the default wsdl from file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl");
+ // e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public SimpleService_Service(URL wsdlLocation) {
+ super(wsdlLocation, SERVICE);
+ }
+
+ public SimpleService_Service(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SimpleService_Service() {
+ super(WSDL_LOCATION, SERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns SimpleServicePort
+ */
+ @WebEndpoint(name = "SimpleServicePort")
+ public SimpleService getSimpleServicePort() {
+ return super.getPort(SimpleServicePort, SimpleService.class);
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,71 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF (incubator) 2.0.5-incubator
+ * Wed Apr 16 14:19:05 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+public final class SimpleService_SimpleServicePort_Client {
+
+ private static final QName SERVICE_NAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
+
+ private SimpleService_SimpleServicePort_Client() {
+ }
+
+ public static void main(String args[]) throws Exception {
+ URL wsdlURL = SimpleService_Service.WSDL_LOCATION;
+ if (args.length > 0) {
+ File wsdlFile = new File(args[0]);
+ try {
+ if (wsdlFile.exists()) {
+ wsdlURL = wsdlFile.toURI().toURL();
+ } else {
+ wsdlURL = new URL(args[0]);
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ SimpleService_Service ss = new SimpleService_Service(wsdlURL, SERVICE_NAME);
+ SimpleService port = ss.getSimpleServicePort();
+
+ {
+ System.out.println("Invoking ping...");
+ port.ping();
+
+
+ }
+ {
+ System.out.println("Invoking echo...");
+ java.lang.String _echo_arg0 = "";
+ java.lang.String _echo__return = port.echo(_echo_arg0);
+ System.out.println("echo.result=" + _echo__return);
+
+
+ }
+
+ System.exit(0);
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,50 @@
+/*
+ * 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.wsrm.service;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ name = "SimpleService",
+ serviceName = "SimpleService",
+ wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
+public class SimpleServiceImpl
+{
+ @Oneway
+ @WebMethod
+ public void ping()
+ {
+ System.out.println("ping()");
+ }
+
+ @WebMethod
+ public String echo(String s)
+ {
+ System.out.println("echo(" + s + ")");
+ return s;
+ }
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,35 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Wed Apr 16 13:57:06 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+
+public class Echo {
+
+ @XmlElement(name = "arg0")
+ private java.lang.String arg0;
+
+ public java.lang.String getArg0() {
+ return this.arg0;
+ }
+
+ public void setArg0( java.lang.String newArg0 ) {
+ this.arg0 = newArg0;
+ }
+
+}
+
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,35 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Wed Apr 16 13:57:06 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+
+public class EchoResponse {
+
+ @XmlElement(name = "return")
+ private java.lang.String _return;
+
+ public java.lang.String get_return() {
+ return this._return;
+ }
+
+ public void set_return( java.lang.String new_return ) {
+ this._return = new_return;
+ }
+
+}
+
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,24 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Wed Apr 16 13:57:06 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+
+public class Ping {
+
+
+}
+
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>SimpleService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SimpleService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-16 12:44:44 UTC (rev 6456)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm">
+<xsd:element name="ping" type="tns:ping"/>
+<xsd:complexType name="ping">
+<xsd:sequence/>
+</xsd:complexType>
+<xsd:element name="echo" type="tns:echo"/>
+<xsd:complexType name="echo">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="echoResponse" type="tns:echoResponse"/>
+<xsd:complexType name="echoResponse">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="return" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part name="parameters" element="tns:echoResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part name="parameters" element="tns:echo">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="ping">
+ <wsdl:part name="parameters" element="tns:ping">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SimpleService">
+ <wsdl:operation name="ping">
+ <wsdl:input name="ping" message="tns:ping">
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="echo">
+ <wsdl:input name="echo" message="tns:echo">
+ </wsdl:input>
+ <wsdl:output name="echoResponse" message="tns:echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="ping">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="ping">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="echo">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SimpleService">
+ <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding">
+ <soap:address location="http://localhost:9090/hello"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
JBossWS SVN: r6455 - in stack/cxf/branches/tdiesler/trunk: runtime/client and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-16 08:12:27 -0400 (Wed, 16 Apr 2008)
New Revision: 6455
Modified:
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml
Log:
partial
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-16 11:54:00 UTC (rev 6454)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-16 12:12:27 UTC (rev 6455)
@@ -32,92 +32,90 @@
<module>runtime</module>
</modules>
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <version>1.2.0.GA</version>
- <type>sar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-jms</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- <version>4.2.1.SP1</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>1.2.0.GA</version>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>4.2.1.SP1</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<!-- Plugins -->
<build>
Modified: stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml 2008-04-16 11:54:00 UTC (rev 6454)
+++ stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml 2008-04-16 12:12:27 UTC (rev 6455)
@@ -12,4 +12,52 @@
<version>3.0.2-SNAPSHOT</version>
</parent>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <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>
+ </dependencies>
+
</project>
Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-16 11:54:00 UTC (rev 6454)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-16 12:12:27 UTC (rev 6455)
@@ -13,6 +13,65 @@
<version>3.0.2-SNAPSHOT</version>
</parent>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <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>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
<!-- Plugins -->
<build>
<resources>
Modified: stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-16 11:54:00 UTC (rev 6454)
+++ stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-16 12:12:27 UTC (rev 6455)
@@ -17,7 +17,7 @@
<properties>
<jbossws.integration.target>jboss500</jbossws.integration.target>
<jboss.bind.address>localhost</jboss.bind.address>
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.version>5.0.0.Beta4</jboss.version>
<surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
</properties>
@@ -97,13 +97,63 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jnp-client</artifactId>
- <version>5.0.0.Beta4</version>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jboss-client</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-integration</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jmx-invoker-adaptor-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>5.0.0.Beta3Update1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>2.0.2.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.2.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
16 years, 9 months