JBossWS SVN: r5415 - in framework/trunk/hudson/hudson-home/jobs: CXF-Distro-AS-4.2.3 and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-08 07:28:32 -0500 (Tue, 08 Jan 2008)
New Revision: 5415
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
Log:
-Dforce.thirdparty.get=true
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -43,7 +43,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -43,7 +43,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -27,7 +27,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -27,7 +27,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -25,7 +25,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -51,7 +51,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -51,7 +51,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-01-08 12:28:32 UTC (rev 5415)
@@ -41,7 +41,7 @@
#
cd $STACKNATIVE
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
16 years, 4 months
JBossWS SVN: r5414 - framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-08 07:27:49 -0500 (Tue, 08 Jan 2008)
New Revision: 5414
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
Log:
-Dforce.thirdparty.get=true
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-01-08 12:15:00 UTC (rev 5413)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-01-08 12:27:49 UTC (rev 5414)
@@ -43,7 +43,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT clean build-bin-dist
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
#
# Deploy distro
16 years, 4 months
JBossWS SVN: r5413 - stack/native/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-08 07:15:00 -0500 (Tue, 08 Jan 2008)
New Revision: 5413
Modified:
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/bin-dist-deploy.xml
Log:
Fix typos
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2008-01-08 11:52:38 UTC (rev 5412)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2008-01-08 12:15:00 UTC (rev 5413)
@@ -10,7 +10,7 @@
jboss423.home=(a)jboss423.home@
jboss500.home=(a)jboss500.home@
-# The JBoss server under test. This can be [jboss405|jboss421|jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-01-08 11:52:38 UTC (rev 5412)
+++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-01-08 12:15:00 UTC (rev 5413)
@@ -25,7 +25,7 @@
<macro-deploy-native405-no-ejb3/>
<echo>*********************************</echo>
<echo>* JBossWS EJB3 support disabled *</echo>
- <echo>* All EJB3 tests will fail. *</echo>
+ <echo>* All EJB3 tests will fail. *</echo>
<echo>*********************************</echo>
</target>
16 years, 4 months
JBossWS SVN: r5412 - in stack/metro/branches/hbraun: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-08 06:52:38 -0500 (Tue, 08 Jan 2008)
New Revision: 5412
Modified:
stack/metro/branches/hbraun/ant-import/build-metro.xml
stack/metro/branches/hbraun/ant.properties.example
Log:
Conditional build based on cvs tag
Modified: stack/metro/branches/hbraun/ant-import/build-metro.xml
===================================================================
--- stack/metro/branches/hbraun/ant-import/build-metro.xml 2008-01-08 10:19:30 UTC (rev 5411)
+++ stack/metro/branches/hbraun/ant-import/build-metro.xml 2008-01-08 11:52:38 UTC (rev 5412)
@@ -13,9 +13,6 @@
<project basedir="." name="Build-Metro">
-
- <property name="cvs.user" value="heiko_braun"/>
- <property name="cvs.tag" value="WSIT-1_0-BRANCH"/>
<property name="cvs.dir" value="cvs"/>
<property name="metro.dir" value="${cvs.dir}/wsit/wsit"/>
@@ -23,7 +20,7 @@
<attribute name="target" default="main"/>
<attribute name="file" default="build.xml"/>
<sequential>
- <exec dir="${metro.dir}" executable="ant">
+ <exec dir="${metro.dir}" executable="ant" failonerror="true">
<arg value="@{target}"/>
<arg value="-f"/>
<arg value="@{file}"/>
@@ -31,11 +28,20 @@
</sequential>
</macrodef>
- <target name="checkout" depends="init" description="Checkout/Update the local metro sources">
+ <target name="-cvs.init">
+ <available property="same.checkout" file="checkout_id-${cvs.tag}" type="file"/>
+ </target>
+ <target name="checkout" depends="init, -cvs.init, -cvs.message" unless="same.checkout"
+ description="Checkout/Update the local metro sources">
+
+ <touch file="checkout_id-${cvs.tag}"/>
+
<mkdir dir="${cvs.dir}"/>
+ <echo>**********************************</echo>
<echo>CVS out to: ${cvs.dir}</echo>
+ <echo>**********************************</echo>
<cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs"
package="wsit/wsit"
@@ -45,15 +51,28 @@
</target>
+ <target name="-cvs.message" if="same.checkout">
+ <echo>**********************************</echo>
+ <echo>No checkout required.</echo>
+ <echo>Using same CVS tag: ${cvs.tag} </echo>
+ <echo>To force an update you need to remove the file './checkout_id-${cvs.tag}'</echo>
+ <echo>**********************************</echo>
+ </target>
+
<target name="install.adapter" depends="init">
<copy todir="${metro.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/>
</target>
<target name="clean.metro">
<antbridge target="clean"/>
+ <delete dir="thirdparty-gen"/>
</target>
- <target name="build.metro" depends="clean.metro, install.adapter">
+ <target name="clean.cvs">
+ <delete file="checkout_id-${cvs.tag}"/>
+ </target>
+
+ <target name="build.metro" depends="checkout, install.adapter, clean.metro">
<antbridge target="copy-binaries" file="metro-build-adapter.xml"/>
<echo>*********************************</echo>
<echo>The metro binaries have been copied to 'thirdparty-gen'</echo>
Modified: stack/metro/branches/hbraun/ant.properties.example
===================================================================
--- stack/metro/branches/hbraun/ant.properties.example 2008-01-08 10:19:30 UTC (rev 5411)
+++ stack/metro/branches/hbraun/ant.properties.example 2008-01-08 11:52:38 UTC (rev 5412)
@@ -38,3 +38,9 @@
javac.deprecation=no
javac.fail.onerror=yes
javac.verbose=no
+
+#
+# Metro CVS access
+#
+cvs.user=NONE
+cvs.tag=WSIT-1_0-BRANCH
\ No newline at end of file
16 years, 4 months
JBossWS SVN: r5411 - stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-08 05:19:30 -0500 (Tue, 08 Jan 2008)
New Revision: 5411
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
Log:
Fix dependency on javax.annotation for non ejb3 containers
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-01-08 08:02:21 UTC (rev 5410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-01-08 10:19:30 UTC (rev 5411)
@@ -173,6 +173,17 @@
private void injectResources(Handler handler)
{
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ ctxLoader.loadClass("javax.annotation.Resource");
+ }
+ catch (Throwable th)
+ {
+ log.debug("Cannot inject resources: " + th.toString());
+ return;
+ }
+
Class<? extends Handler> handlerClass = handler.getClass();
for (Field field : handlerClass.getFields())
{
@@ -188,6 +199,17 @@
private void callPostConstruct(Handler handler) throws Exception
{
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ ctxLoader.loadClass("javax.annotation.PostConstruct");
+ }
+ catch (Throwable th)
+ {
+ log.debug("Cannot call post construct: " + th.toString());
+ return;
+ }
+
Class<? extends Handler> handlerClass = handler.getClass();
for (Method method : handlerClass.getMethods())
{
16 years, 4 months
JBossWS SVN: r5410 - container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-01-08 03:02:21 -0500 (Tue, 08 Jan 2008)
New Revision: 5410
Added:
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources/jbossws-jboss40-config-no-ejb3.xml
Log:
fix hudson regression for 4.0.5 no ejb3
Added: container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources/jbossws-jboss40-config-no-ejb3.xml
===================================================================
--- container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources/jbossws-jboss40-config-no-ejb3.xml (rev 0)
+++ container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources/jbossws-jboss40-config-no-ejb3.xml 2008-01-08 08:02:21 UTC (rev 5410)
@@ -0,0 +1,266 @@
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
+
+ <!-- The HTTPServer used by the JAXWS Endpoint API -->
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss40.DeploymentAspectHttpServer"/>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeploymentAspectManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeploymentAspectManager.undeploy(dep)
+
+ Each deployer hook has a web service DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+ <!-- Phase 1-->
+ <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPreJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPostJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookEJB21">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPreJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPostJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ Each DeploymentAspectManger maintains a list of DeploymentAspects
+ -->
+ <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerPreJSE</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="name">WSDeploymentAspectManagerPostJSE</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEJB</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
+ </bean>
+
+ <!--
+ The container deployment aspects
+ -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
+ <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ </bean>
+
+ <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+ <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
+ </bean>
+
+ <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContainerEndpointHandler</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName</property>
+ <property name="provides">RegisteredEndpoint</property>
+ </bean>
+
+ <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ModifyWebMetaDataDeploymentAspect">
+ <property name="requires">ContextProperties, ContainerMetaData</property>
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">RuntimeLoader</property>
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ </bean>
+
+ <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss40.WebAppDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties</property>
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">WebMetaData</property>
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ </bean>
+
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/>
+ <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ContainerMetaDataAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss40.SecurityHandlerEJB21"/>
+ <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss40.DefaultWebAppDesciptorModifierImpl"/>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss40.JSEArchiveMetaDataAdapter"/>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss40.WebXMLRewriterImpl">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+
+ <!-- Phase 1 -->
+ <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
Property changes on: container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/resources/jbossws-jboss40-config-no-ejb3.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 4 months
JBossWS SVN: r5409 - stack/native/trunk/src/main/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-07 12:09:08 -0500 (Mon, 07 Jan 2008)
New Revision: 5409
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSTools.java
Log:
Improved error handling and exit codes
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSTools.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSTools.java 2008-01-07 17:08:13 UTC (rev 5408)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSTools.java 2008-01-07 17:09:08 UTC (rev 5409)
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.PrintWriter;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.StringTokenizer;
@@ -46,7 +47,7 @@
private static Logger log = Logger.getLogger(WSTools.class);
/**
- * Entry point for the cmd line scripts.
+ * Entry point for the command line scripts.
* Just passes the arguments to
* @see generate(String)
* @param args
@@ -55,7 +56,19 @@
public static void main(String[] args) throws IOException
{
WSTools tools = new WSTools();
- tools.generate(args);
+ boolean success = false;
+ try
+ {
+ success = tools.generate(args);
+ } catch (Throwable e)
+ {
+ e.printStackTrace( new PrintWriter(System.err) );
+ }
+
+ if(success)
+ System.exit(0);
+ else
+ System.exit(1);
}
/**
@@ -148,7 +161,7 @@
}
else
{
- throw new WSException("Nothing done, Configuration source must have JavaToWSDL or WSDLToJava specified");
+ throw new IOException("Nothing done, Configuration source must have JavaToWSDL or WSDLToJava specified");
}
return true;
}
16 years, 4 months
JBossWS SVN: r5408 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-07 12:08:13 -0500 (Mon, 07 Jan 2008)
New Revision: 5408
Modified:
stack/native/trunk/version.properties
Log:
Update jboss40 integration to SP2. Fixes a copy paste error
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-01-07 17:07:31 UTC (rev 5407)
+++ stack/native/trunk/version.properties 2008-01-07 17:08:13 UTC (rev 5408)
@@ -27,7 +27,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss40=4.0.5.SP1
+jbossws-jboss40=4.0.5.SP2
jbossws-jboss42=4.2.1.GA
# JBossAS-5.0
16 years, 4 months
JBossWS SVN: r5407 - stack/native/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-07 12:07:31 -0500 (Mon, 07 Jan 2008)
New Revision: 5407
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
Log:
Fix exclude list
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-07 17:06:19 UTC (rev 5406)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-07 17:07:31 UTC (rev 5407)
@@ -71,3 +71,4 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params), whic is not possible for 4.0.5
org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxrpc/jbws1762/**
16 years, 4 months
JBossWS SVN: r5406 - stack/native/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-07 12:06:19 -0500 (Mon, 07 Jan 2008)
New Revision: 5406
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss405.txt
Log:
Fix exclude list
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-07 13:35:53 UTC (rev 5405)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-07 17:06:19 UTC (rev 5406)
@@ -19,3 +19,4 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params), whic is not possible for 4.0.5
org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxrpc/jbws1762/**
16 years, 4 months