[jbossws-commits] JBossWS SVN: r4105 - in trunk: build/ant-import and 30 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Aug 2 11:05:16 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-02 11:05:15 -0400 (Thu, 02 Aug 2007)
New Revision: 4105
Added:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java
trunk/jbossws-core/ant-import/build-bin-dist.xml
trunk/jbossws-core/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import/macros-deploy-native.xml
trunk/jbossws-core/src/main/etc/bin-dist-build.xml
trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml
trunk/jbossws-core/src/main/etc/component-info40.xml
trunk/jbossws-core/src/main/etc/component-info42.xml
trunk/jbossws-core/src/main/etc/component-info50.xml
trunk/jbossws-core/src/main/java/org/jboss/wsf/
trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/
trunk/jbossws-core/src/main/resources/jbossws-context.war/
trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/
trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml
trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml
trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html
trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css
trunk/jbossws-core/src/main/resources/jbossws-native-config.xml
trunk/jbossws-core/src/main/resources/jbossws-native.jar/
trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/
trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/
trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Removed:
trunk/integration/jboss50/
trunk/integration/native/
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java
trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/
Modified:
trunk/build/ant-import/build-setup.xml
trunk/build/ant-import/build-testsuite.xml
trunk/build/build.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
trunk/integration/sunri/.classpath
trunk/integration/sunri/build.xml
trunk/integration/xfire/.classpath
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/build.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant-import/build-deploy.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/version.properties
Log:
Externalize container/jboss50. REmove integration/native
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/ant-import/build-setup.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -21,10 +21,8 @@
<property name="framework.dir" value="${basedir}/integration/spi"/>
<property name="core.dir" value="${basedir}/jbossws-core"/>
<property name="testsuite.dir" value="${basedir}/testsuite"/>
- <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/>
<property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/>
<property name="int.jboss40.dir" value="${basedir}/integration/jboss40"/>
- <property name="int.native.dir" value="${basedir}/integration/native"/>
<property name="int.sunri.dir" value="${basedir}/integration/sunri"/>
<property name="int.xfire.dir" value="${basedir}/integration/xfire"/>
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -103,8 +103,6 @@
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
<pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/build.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -125,11 +125,9 @@
<delete dir="${build.dir}/output"/>
<ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/>
</target>
@@ -139,10 +137,8 @@
<ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss40.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
</target>
@@ -156,14 +152,12 @@
<target name="most" description="Builds almost everything." depends="prepare">
<ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/>
</target>
<target name="all" description="Create a distribution zip file" depends="prepare">
<ant antfile="${core.dir}/build.xml" target="all" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="all" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="all" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="all" inheritall="false"/>
</target>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -29,7 +29,7 @@
#
# Build jbws-jboss40
#
-cd $JBWSDIR/integration/native
+cd $JBWSDIR/jbossws-core
./build.sh $ENVIRONMENT deploy-jboss40
#
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -29,7 +29,7 @@
#
# Build jbws-jboss42
#
-cd $JBWSDIR/integration/native
+cd $JBWSDIR/jbossws-core
./build.sh $ENVIRONMENT deploy-jboss42
#
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -29,7 +29,7 @@
#
# Build deploy-jboss50
#
-cd $JBWSDIR/integration/native
+cd $JBWSDIR/jbossws-core
./build.sh $ENVIRONMENT deploy-jboss50
#
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -48,7 +48,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -21,21 +21,25 @@
*/
package org.jboss.wsf.container.jboss40;
-import org.jboss.wsf.spi.invocation.*;
-
import javax.xml.ws.handler.MessageContext;
+import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextEJB;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
+import org.jboss.wsf.spi.invocation.WebServiceContextJSE;
+
/**
* @author Heiko.Braun at jboss.com
* Created: Jul 25, 2007
*/
public class WebServiceContextFactoryImpl extends WebServiceContextFactory
{
- public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
+ public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
{
- ExtendableWebServiceContext context = null;
+ ExtensibleWebServiceContext context = null;
- if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
+ if (type.toString().indexOf("EJB") != -1 || type.toString().indexOf("MDB") != -1)
context = new WebServiceContextEJB(messageContext);
else
context = new WebServiceContextJSE(messageContext);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -26,15 +26,14 @@
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceException;
-import org.jboss.wsf.framework.DefaultExtensible;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.Service;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.http.HttpContext;
import org.jboss.wsf.spi.http.HttpContextFactory;
import org.jboss.wsf.spi.http.HttpServer;
@@ -45,7 +44,7 @@
* @author Thomas.Diesler at jboss.org
* @since 07-Jul-2006
*/
-public class DeploymentAspectHttpServer extends DefaultExtensible implements HttpServer
+public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
/** Start an instance of this HTTP server */
public void start()
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -42,9 +42,8 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext;
+import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.InvocationType;
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
@@ -132,7 +131,8 @@
{
EJBContext ejbCtx = beanCtx.getEJBContext();
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext);
+ WebServiceContextFactory factory = spiProvider.getSPI(WebServiceContextFactory.class);
+ ExtensibleWebServiceContext wsContext = factory.newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext);
wsContext.addAttachment(EJBContext.class, ejbCtx);
beanProp.set(beanCtx.getInstance(), wsContext);
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -36,9 +36,9 @@
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.DOMWriter;
-import org.jboss.wsf.framework.DefaultExtensible;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.http.HttpContext;
import org.jboss.wsf.spi.http.HttpContextFactory;
import org.jboss.wsf.spi.http.HttpServer;
@@ -52,7 +52,7 @@
* @author Thomas.Diesler at jboss.org
* @since 07-Jul-2006
*/
-public class WebAppDeployingHttpServer extends DefaultExtensible implements HttpServer
+public class WebAppDeployingHttpServer extends AbstractExtensible implements HttpServer
{
private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -31,9 +31,9 @@
*/
public class WebServiceContextFactoryImpl extends WebServiceContextFactory
{
- public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
+ public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
{
- ExtendableWebServiceContext context = null;
+ ExtensibleWebServiceContext context = null;
if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
context = new WebServiceContextEJB(messageContext);
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.framework;
-
-//$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun at jboss.com $
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.wsf.spi.Extensible;
-
-/**
- * A general extendible artifact
- *
- * @author Thomas.Diesler at jboss.com
- * @since 20-Apr-2007
- */
-public class DefaultExtensible implements Extensible
-{
- private Map<Class, Object> attachments = new HashMap<Class, Object>();
- private Map<String, Object> properties = new HashMap<String, Object>();
-
- public Collection<Object> getAttachments()
- {
- return attachments.values();
- }
-
- public <T> T getAttachment(Class<T> clazz)
- {
- return (T)attachments.get(clazz);
- }
-
- public <T> T addAttachment(Class<T> clazz, Object obj)
- {
- return (T)attachments.put(clazz, obj);
- }
-
- public <T> T removeAttachment(Class<T> key)
- {
- return (T)attachments.remove(key);
- }
-
- public Set<String> getProperties()
- {
- return properties.keySet();
- }
-
- public Object getProperty(String key)
- {
- return properties.get(key);
- }
-
- public void removeProperty(String key)
- {
- properties.remove(key);
- }
-
- public void setProperty(String key, Object value)
- {
- properties.put(key, value);
- }
-
- public void setProperties(Map<String, Object> props)
- {
- properties.putAll(props);
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.framework.deployment;
-import org.jboss.wsf.framework.DefaultExtensible;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Service;
@@ -35,7 +35,7 @@
* @author Thomas.Diesler at jboss.com
* @since 20-Apr-2007
*/
-public class DefaultDeployment extends DefaultExtensible implements Deployment
+public class DefaultDeployment extends AbstractExtensible implements Deployment
{
// The name for this deployment
private String simpleName;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -26,8 +26,8 @@
import javax.management.ObjectName;
-import org.jboss.wsf.framework.DefaultExtensible;
import org.jboss.wsf.spi.binding.BindingCustomization;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.LifecycleHandler;
import org.jboss.wsf.spi.deployment.Service;
@@ -42,7 +42,7 @@
* @author Thomas.Diesler at jboss.com
* @since 20-Apr-2007
*/
-public class DefaultEndpoint extends DefaultExtensible implements Endpoint
+public class DefaultEndpoint extends AbstractExtensible implements Endpoint
{
private Service service;
private ObjectName name;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.wsf.framework.DefaultExtensible;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -40,7 +40,7 @@
* @author Thomas.Diesler at jboss.com
* @since 20-Apr-2007
*/
-public class DefaultService extends DefaultExtensible implements Service
+public class DefaultService extends AbstractExtensible implements Service
{
private Deployment dep;
private List<Endpoint> endpoints = new LinkedList<Endpoint>();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -23,7 +23,7 @@
//$Id: HttpContext.java 1757 2006-12-22 15:40:24Z thomas.diesler at jboss.com $
-import org.jboss.wsf.framework.DefaultExtensible;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.http.HttpContext;
import org.jboss.wsf.spi.http.HttpServer;
@@ -33,7 +33,7 @@
* @author Thomas.Diesler at jboss.org
* @since 07-Jul-2006
*/
-public class DefaultHttpContext extends DefaultExtensible implements HttpContext
+public class DefaultHttpContext extends AbstractExtensible implements HttpContext
{
private HttpServer server;
private String contextRoot;
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java (from rev 4087, spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,107 @@
+/*
+ * 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.wsf.framework.management;
+
+// $Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointResolver;
+
+import javax.management.ObjectName;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A general endpoint registry.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 20-Apr-2007
+ */
+public class DefaultEndpointRegistry implements EndpointRegistry
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(DefaultEndpointRegistry.class);
+
+ private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>();
+
+ public Endpoint getEndpoint(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ Endpoint endpoint = endpoints.get(epName);
+ return endpoint;
+ }
+
+ public Endpoint resolve(EndpointResolver resolver)
+ {
+ return resolver.query(endpoints.values().iterator());
+ }
+
+ public boolean isRegistered(ObjectName epName)
+ {
+ if (epName == null)
+ throw new IllegalArgumentException("Endpoint name cannot be null");
+
+ return endpoints.get(epName) != null;
+ }
+
+ public Set<ObjectName> getEndpoints()
+ {
+ return endpoints.keySet();
+ }
+
+ public void register(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (epName == null)
+ throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint);
+
+ if (isRegistered(epName))
+ throw new IllegalStateException("Endpoint already registered: " + epName);
+
+ log.info("register: " + epName);
+ endpoints.put(epName, endpoint);
+ }
+
+ public void unregister(Endpoint endpoint)
+ {
+ if (endpoint == null)
+ throw new IllegalArgumentException("Endpoint cannot be null");
+
+ ObjectName epName = endpoint.getName();
+ if (isRegistered(epName) == false)
+ throw new IllegalStateException("Endpoint not registered: " + epName);
+
+ log.info("remove: " + epName);
+ endpoints.remove(epName);
+ }
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-08-02 15:05:15 UTC (rev 4105)
@@ -28,7 +28,6 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.DefaultEndpointRegistry;
/**
* A Service Endpoint Registry
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/sunri/.classpath 2007-08-02 15:05:15 UTC (rev 4105)
@@ -20,7 +20,6 @@
<classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
<classpathentry kind="lib" path="thirdparty/streambuffer.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
<classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/sunri/build.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -145,8 +145,6 @@
<target name="jars-jboss50" depends="jars-common" if="jboss50.home">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jbossws-beans.xml -->
<concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
<header trimleading="yes">
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/xfire/.classpath 2007-08-02 15:05:15 UTC (rev 4105)
@@ -7,7 +7,6 @@
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="lib" path="thirdparty/cxf-incubator.jar" sourcepath="/home/tdiesler/Download/java/apache/cxf/apache-cxf-2.0-incubator-src.zip"/>
<classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata.jar"/>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -33,6 +33,7 @@
<pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/>
+ <pathelement location="${int.xfire.dir}/thirdparty/jaxb-api.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/jdom.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/neethi.jar"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/integration/xfire/build.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -131,8 +131,6 @@
<target name="jars-jboss50" depends="jars-common" if="jboss50.home">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
-
<!-- Concat jbossws-beans.xml -->
<concat destfile="${xfire.output.lib.dir}/jbossws-xfire50/jbossws-beans.xml">
<header trimleading="yes">
Added: trunk/jbossws-core/ant-import/build-bin-dist.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,179 @@
+<?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: build-bin-dist.xml 4081 2007-08-02 09:23:17Z thomas.diesler at jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
+
+ <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${native.etc.dir}/bin-dist-deploy.xml"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${framework.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${framework.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${core.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}" >
+ <fileset dir="${native.output.dir}">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${build.dir}/dist">
+ <include name="Install.txt"/>
+ <include name="ReleaseNotes.txt"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${build.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50-deployer.zip"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss40.dir}/output/lib">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-core-scripts.zip"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-native40.sar"/>
+ <include name="jbossws-native42.sar"/>
+ <include name="jbossws-native50.sar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="juddi-service.sar"/>
+ <include name="policy.jar"/>
+ <include name="getopt.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.native.dir}/src/test"/>
+ </copy>
+
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${build.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${build.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+
+ <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip">
+ <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Modified: trunk/jbossws-core/ant-import/build-deploy.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -13,34 +13,116 @@
<project>
- <!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss50" inheritall="false"/>
- </target>
+ <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
- <!-- Undeploy jbossws to jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Undeploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws to jboss50 -->
+ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50">
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <macro-deploy-native50
+ wsflibs="${framework.dir}/output/lib"
+ stacklibs="${core.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
+ jbosshome="${jboss50.home}"/>
+
+ <!-- [JBWS-1617] JAXRPC doc/literal trims empty string
+ <copy tofile="${jboss50.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/>
+ <copy tofile="${jboss50.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/>
+ -->
</target>
- <!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss42" inheritall="false"/>
- </target>
+ <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss50.home}"
+ corelibs="${core.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
+ </target>
- <!-- Undeploy jbossws to jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Undeploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <target name="undeploy-jboss50-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws to jboss42 -->
+ <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42">
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <macro-deploy-native42
+ wsflibs="${framework.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ stacklibs="${int.native.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
+ jbosshome="${jboss42.home}"/>
+
+ <!-- [JBWS-1617] JAXRPC doc/literal trims empty string
+ <copy tofile="${jboss42.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/>
+ <copy tofile="${jboss42.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/>
+ -->
+
</target>
- <!-- Deploy jbossws to jboss40 -->
- <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss40" inheritall="false"/>
- </target>
+ <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss42.home}"
+ corelibs="${core.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
+ </target>
+ <target name="undeploy-jboss42-endorsed" depends="prepare">
+ <macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
+ </target>
- <!-- Undeploy jbossws to jboss40 -->
- <target name="undeploy-jboss40" depends="prepare" description="Undeploy jbossws">
- <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss40" inheritall="false"/>
- </target>
+ <!-- Deploy jbossws to jboss40 -->
+ <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/>
+ <target name="deploy-jboss40-ejb3">
+ <macro-deploy-native40
+ wsflibs="${framework.dir}/output/lib"
+ jbosslibs="${int.jboss40.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ stacklibs="${int.native.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available">
+ <macro-setup-native40-no-ejb3/>
+ <echo>
+ ***********************************
+ * JBossWS EJB3 support disabled *
+ * All EJB3 tests will fail. *
+ ***********************************
+ </echo>
+ </target>
+
+ <!-- Remove jbossws from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-wsf jbosshome="${jboss40.home}"/>
+ </target>
</project>
Added: trunk/jbossws-core/ant-import/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-testsuite.xml (rev 0)
+++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,55 @@
+<?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: build-testsuite.xml 4092 2007-08-02 11:14:11Z thomas.diesler at jboss.com $ -->
+
+<project>
+
+ <property name="tests.output.dir" value="${int.native.dir}/output/tests"/>
+ <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
+
+ <property name="tests.dir" value="${testsuite.dir}/src"/>
+ <property name="tests.java.dir" value="${tests.dir}/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-init" depends="tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${jboss.client}/policy.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
+ </target>
+
+</project>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -69,6 +69,8 @@
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
<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-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
Added: trunk/jbossws-core/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/jbossws-core/ant-import/macros-deploy-native.xml (rev 0)
+++ trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,402 @@
+<?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: macros-deploy-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler at jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-native50">
+ <attribute name="wsflibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss50.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{thirdpartylibs}/jbossws-jboss50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native50">
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss50.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss50.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-native42">
+ <attribute name="wsflibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss42.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native42">
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss42.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss42.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss42.home}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-native40">
+ <attribute name="wsflibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="${jboss40.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
+ <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
+
+ <copy todir="${jboss40.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss40.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="policy.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ </copy>
+
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-setup-native40-no-ejb3">
+ <sequential>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native40">
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <delete>
+
+ <!-- BIN SCRIPTS -->
+ <fileset dir="${jboss40.home}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss40.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss40.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jbossws14-client.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss40.home}/lib">
+ <!-- Remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss40.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <!-- Remove only, do not deploy -->
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+ <macrodef name="macro-deploy-endorsed">
+ <attribute name="jbosshome"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy API jars from lib/endorsed -->
+ <macrodef name="macro-undeploy-endorsed">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <fileset dir="@{jbosshome}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -20,7 +20,7 @@
<!-- Define excluded tests -->
<property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
- <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
<!--
Init the various classpaths
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/jbossws-core/build.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -72,6 +72,7 @@
<include name="javax/jws/**"/>
<include name="org/jboss/annotation/**"/>
<include name="org/jboss/ws/**"/>
+ <include name="org/jboss/wsf/stack/jbws/**"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath refid="thirdparty.classpath"/>
</javac>
@@ -100,13 +101,13 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
+ <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files.">
</target>
<!--
| Build all jar files.
-->
- <target name="module-jars">
+ <target name="jars-common" depends="compile">
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${core.output.lib.dir}"/>
@@ -169,6 +170,23 @@
<metainf dir="${core.resources.dir}/standard-config"/>
</jar>
+ <!-- Build jbossws-native.jar -->
+ <jar jarfile="${core.output.lib.dir}/jbossws-native.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/jbws/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jbossws-native.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <copy todir="${core.output.lib.dir}/jbossws-context.war">
+ <fileset dir="${core.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ <include name="WEB-INF/**"/>
+ </fileset>
+ </copy>
+
<!-- Build jbossws-core-scripts.zip -->
<zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" >
<fileset dir="${core.output.etc.dir}">
@@ -188,6 +206,141 @@
</target>
+ <target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+
+ <!-- Concat jbossws-beans.xml -->
+ <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0">
+ </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Build jbossws-native50.sar -->
+ <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-context.war/**"/>
+ <include name="jbossws-native.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jbossws-core.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ <metainf dir="${core.dir}/src/main/resources/standard-config">
+ <include name="standard-*-config.xml"/>
+ </metainf>
+ <metainf dir="${core.output.lib.dir}/jbossws-native50">
+ <include name="jbossws-beans.xml"/>
+ </metainf>
+ </jar>
+
+ </target>
+
+ <target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+
+ <!-- Concat jboss-beans.xml -->
+ <concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-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="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${int.jboss42.dir}/src/main/resources/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Build jbossws-native42.sar -->
+ <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-context.war/**"/>
+ <include name="jbossws-native.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-core.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}/jbossws-native42">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <metainf dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ <metainf dir="${core.dir}/src/main/resources/standard-config">
+ <include name="standard-*-config.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
+ <target name="jars-jboss40" depends="jars-common" if="jboss40.home">
+
+ <ant antfile="${int.jboss40.dir}/build.xml" target="jars" inheritall="false"/>
+
+ <!-- Concat jboss-beans.xml -->
+ <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-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="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${int.jboss40.dir}/src/main/resources/jbossws-jboss40-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Build jbossws-native40.sar -->
+ <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-context.war/**"/>
+ <include name="jbossws-native.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxws.jar"/>
+ <include name="jbossws-core.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}/jbossws-native40">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <metainf dir="${int.jboss40.dir}/src/main/resources/jbossws-jboss40.sar/META-INF"/>
+ <metainf dir="${core.dir}/src/main/resources/standard-config">
+ <include name="standard-*-config.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
Added: trunk/jbossws-core/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/jbossws-core/src/main/etc/bin-dist-build.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,155 @@
+<?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: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler at jboss.com $ -->
+
+<project default="main" basedir="." name="JBossWS-Native">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss40.lib" value="${jboss40.home}/lib"/>
+ <property name="jboss40.client" value="${jboss40.home}/client"/>
+ <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
+ <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
+ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+
+ <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${lib.dir}/jbossws-core.jar"/>
+ <pathelement location="${lib.dir}/jbossws-client.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- dummy jar targets -->
+ <target name="jars-jboss50" depends="prepare"/>
+ <target name="jars-jboss42" depends="prepare"/>
+ <target name="jars-jboss40" depends="prepare"/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Added: trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,112 @@
+<?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: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler at jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/native to jboss50 -->
+ <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50">
+ <macro-undeploy-sunri50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-native50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+ <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss50.home}"
+ corelibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss42 -->
+ <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-native42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+ <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss42.home}"
+ corelibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+ <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss40 -->
+ <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/>
+
+ <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40">
+ <macro-deploy-native40
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available">
+ <macro-setup-native40-no-ejb3/>
+ <echo>
+ ***********************************
+ * JBossWS EJB3 support disabled *
+ * All EJB3 tests will fail. *
+ ***********************************
+ </echo>
+ </target>
+
+ <!-- Remove jbossws/native from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
+
+</project>
Added: trunk/jbossws-core/src/main/etc/component-info40.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/component-info40.xml (rev 0)
+++ trunk/jbossws-core/src/main/etc/component-info40.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,28 @@
+<project name="jboss/jbossws-native40">
+
+ <component id="jboss/jbossws-native40"
+ description="JBossWS an implementation of J2EE Web Services"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-native40.sar"/>
+
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb@"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss40@"/>
+ </import>
+ <import componentref="jboss/jbossws">
+ <compatible version="@repository.id@"/>
+ </import>
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@repository.id@"/>
+ </import>
+
+ <export>
+ </export>
+
+ </component>
+
+</project>
Added: trunk/jbossws-core/src/main/etc/component-info42.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/component-info42.xml (rev 0)
+++ trunk/jbossws-core/src/main/etc/component-info42.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,30 @@
+<project name="jboss/jbossws-native42">
+
+ <component id="jboss/jbossws-native42"
+ description="JBossWS an implementation of J2EE Web Services"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-native42.sar"/>
+
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb-jboss42@"/>
+ <compatible version="@jboss-jbossxb-jboss42 at -brew"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss42@"/>
+ <compatible version="@jboss-remoting-jboss42 at -brew"/>
+ </import>
+ <import componentref="jboss/jbossws">
+ <compatible version="@repository.id@"/>
+ </import>
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@repository.id@"/>
+ </import>
+
+ <export>
+ </export>
+
+ </component>
+
+</project>
Added: trunk/jbossws-core/src/main/etc/component-info50.xml
===================================================================
--- trunk/jbossws-core/src/main/etc/component-info50.xml (rev 0)
+++ trunk/jbossws-core/src/main/etc/component-info50.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,28 @@
+<project name="jboss/jbossws-native50">
+
+ <component id="jboss/jbossws-native50"
+ description="JBossWS an implementation of J2EE Web Services"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-native50.sar"/>
+
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb-jboss50@"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss50@"/>
+ </import>
+ <import componentref="jboss/jbossws">
+ <compatible version="@repository.id@"/>
+ </import>
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@repository.id@"/>
+ </import>
+
+ <export>
+ </export>
+
+ </component>
+
+</project>
Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf (from rev 4091, trunk/integration/native/src/main/java/org/jboss/wsf)
Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack (from rev 4104, trunk/integration/native/src/main/java/org/jboss/wsf/stack)
Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- A security domain that restricts access
+ <security-domain>java:/jaas/JBossWS</security-domain>
+ -->
+
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ A web application that installs the JBossWS servlets
+
+ $Id: web.xml 4016 2007-07-27 06:00:11Z thomas.diesler at jboss.com $
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+ <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <url-pattern>/pclink</url-pattern>
+ </servlet-mapping>
+
+ <!-- A security constraint that restricts access
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>ContextServlet</web-resource-name>
+ <description>An example security config that only allows users with the
+ role 'friend' to access the JBossWS console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>friend</role-name>
+ </auth-constraint>
+ </security-constraint>
+ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBossWS Management Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>friend</role-name>
+ </security-role>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,63 @@
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBossWS</title>
+<link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class='pageHeader'>Welcome to JBoss Web Services</div>
+
+<div class="pageSection">
+<h2>J2EE compatible web services</h2>
+JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering.
+</div>
+
+<div class="pageSection">
+<h3>Administration</h3>
+
+<fieldset>
+ <legend><b>Runtime information</b></legend>
+<ul>
+ <li><a href="services">View a list of deployed services</a></li>
+ <!--li><a href="depends">View installed dependencies</a></li-->
+ <li><a href="/jmx-console/">Access JMX console</a></li>
+</ul>
+</fieldset>
+</div>
+
+<div class="pageSection">
+<h3>Project information</h3>
+
+<fieldset>
+ <legend><b>Documentation</b></legend>
+
+<ul>
+ <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Community</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
+ <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Source repository</b></legend>
+<ul>
+ <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li>
+ <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
+</ul>
+</fieldset>
+</div>
+
+</body>
+</html>
Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,186 @@
+
+/* table for list views */
+.table_list {
+}
+
+/* table for detail views */
+.table_form {
+}
+
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #aaaadd;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
+/* table row header */
+.list_tr_head {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ font-weight: 600;
+ text-align: center;
+ background-color: #aaaadd;
+}
+
+/* table row list view */
+.list_tr {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view odd lines */
+.list_tr_even {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view even lines */
+.list_tr_odd {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+}
+
+/* form label */
+.form_label {
+ font-family: Verdana, sans-serif;
+ font-weight: 500;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+/* form value */
+.form_value {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: baseline;
+}
+
+/* tiny writing */
+.tiny {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #666666;
+}
+
+/* required input fields */
+.inputmust {
+ background-color: #dddddd;
+}
+
+/* error message */
+.error {
+ font-family: Courier New;
+ color: #990000;
+}
+
+/* error message */
+.error_trace {
+ font-family: Courier New;
+}
+
+/* active tree node */
+.tree_active_label {
+ font-weight: bold;
+}
+
+body {
+ font-family: Verdana,, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ background-color: #ffffff;
+}
+
+/* title style */
+h1 {
+ font-family: Verdana, sans-serif;
+ font-size: 14pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h2 {
+ font-family: Verdana, sans-serif;
+ font-size: 12pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h3 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h4 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 500;
+ color: #000066;
+}
+
+/* table desk */
+td {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+input, textarea, select, option {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+}
+
+a {
+ font-family: Verdana, sans-serif;
+ color: #0000dd;
+ text-decoration: none;
+}
+
+a:hover{
+ font-family: Verdana, sans-serif;
+ color: #cc0000;
+ text-decoration: none;
+}
+
+pre {
+ background:#dddddd
+}
\ No newline at end of file
Added: trunk/jbossws-core/src/main/resources/jbossws-native-config.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-native-config.xml (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-native-config.xml 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,125 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <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>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler, ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">PublishedContract</property>
+ </bean>
+
+ <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires">ContainerMetaData, URLPattern, VFSRoot</property>
+ <property name="provides">UnifiedMetaDataModel, StackDescriptor</property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+ <bean name="WSNativeDeploymentAspectInstallerJSE" 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="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
+ </bean>
+ <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
+ <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
+ </bean>
+
\ No newline at end of file
Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl
\ No newline at end of file
Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl
\ No newline at end of file
Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1 @@
+org.jboss.ws.core.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,14 @@
+# JBossAS-4.0 excludes
+org/jboss/test/ws/jaxrpc/jbws723/**
+
+# benchmark tests
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,11 @@
+# benchmark tests
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+org/jboss/test/ws/jaxws/webserviceref/**
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-08-02 15:05:15 UTC (rev 4105)
@@ -0,0 +1,19 @@
+# benchmark tests
+#org/jboss/test/ws/benchmark/**
+
+# Fix before JBoss50 goes final
+org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
+org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
+org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
+org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
+org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
+org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
+org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
+org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
+org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
+
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-08-02 14:39:29 UTC (rev 4104)
+++ trunk/jbossws-core/version.properties 2007-08-02 15:05:15 UTC (rev 4105)
@@ -6,6 +6,9 @@
ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
jbpm-bpel=1.1.0.Beta5
+jbossws-common=2.0.1.CR1
+jbossws-spi=2.0.1.CR1
+jbossws-jboss50=2.0.1.CR1
# Thirdparty library versions
apache-collections=3.1
More information about the jbossws-commits
mailing list