JBossWS SVN: r3530 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-11 09:16:27 -0400 (Mon, 11 Jun 2007)
New Revision: 3530
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
Log:
Fix JBWS-1505
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-11 09:48:49 UTC (rev 3529)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-11 13:16:27 UTC (rev 3530)
@@ -250,6 +250,13 @@
</fileset>
</jar>
+ <!-- jaxws-jbws1505 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/>
+ </fileset>
+ </jar>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java 2007-06-11 13:16:27 UTC (rev 3530)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1505;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public final class CustomType implements Interface2
+{
+ private int member1 = 1;
+ private int member2 = 2;
+
+ public int getMember2()
+ {
+ return this.member2;
+ }
+
+ public void setMember2(int member2)
+ {
+
+ }
+
+ public CustomType getCustomType()
+ {
+ return null;
+ }
+
+ public int getMember1()
+ {
+ return this.member1;
+ }
+
+ public void setMember1(int member1)
+ {
+
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2007-06-11 13:16:27 UTC (rev 3530)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1505;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public interface Interface1
+{
+ public int getMember1();
+ public void setMember1(int member1);
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2007-06-11 13:16:27 UTC (rev 3530)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1505;
+
+import javax.jws.WebService;
+import javax.ejb.Remote;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1505")
+@Remote
+public interface Interface2 extends Interface1
+{
+ public int getMember2();
+ public void setMember2(int member2);
+
+ public CustomType getCustomType();
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java 2007-06-11 13:16:27 UTC (rev 3530)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1505;
+
+import javax.jws.WebService;
+import javax.ejb.Stateless;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1505.Interface2",
+ serviceName = "JBWS1505Service",
+ targetNamespace = "http://org.jboss.test.ws/jbws1505"
+)
+@Stateless
+public class JBWS1505EndpointImpl implements Interface2
+{
+
+ private int member = 1;
+ private int member2 = 2;
+
+ public int getMember2()
+ {
+ return this.member2;
+ }
+
+ public void setMember2(int member2)
+ {
+ this.member = member2;
+ }
+
+ public CustomType getCustomType()
+ {
+ return new CustomType();
+ }
+
+ public int getMember1()
+ {
+ return this.member;
+ }
+
+ public void setMember1(int member1)
+ {
+ this.member = member1;
+ }
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2007-06-11 13:16:27 UTC (rev 3530)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1505;
+
+import junit.framework.Test;
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.ws.WSException;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.URL;
+import java.io.File;
+
+/**
+ * Verify wsdl gerneration on SEI inheritance.
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1505
+ *
+ * @version $Revision:1370 $
+ */
+public class JBWS1505TestCase extends JBossWSTest
+{
+ private String targetNS = "http://org.jboss.test.ws/jbws1505";
+ private Interface2 port;
+ private URL wsdlURL;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1505Service");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505EndpointImpl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(Interface2.class);
+ }
+
+ /**
+ * All methods on the SEI should be mapped.
+ *
+ * @throws Exception
+ */
+ public void testWSDLGeneration() throws Exception
+ {
+ try
+ {
+ WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL);
+ assertTrue(wsdl.getInterfaces().length == 1); // a single port
+ assertTrue(wsdl.getInterfaces()[0].getOperations().length == 5); // with five op's
+ }
+ catch (Exception ex)
+ {
+ WSException.rethrow(ex);
+ }
+ }
+
+ /**
+ * Complex types that inherit from a SEI hirarchy shold expose
+ * all members in xml schema.
+ *
+ * @throws Exception
+ */
+ public void testTypeInheritance() throws Exception
+ {
+ try
+ {
+ CustomType ct = port.getCustomType();
+ assertTrue(ct.getMember1() == 1);
+ assertTrue(ct.getMember2() == 2);
+ }
+ catch (Exception ex)
+ {
+ WSException.rethrow(ex);
+ }
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3528 - in branches/jbossws-2.0: integration/native/src/main/resources/jbossws-native50.sar/META-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-11 04:29:33 -0400 (Mon, 11 Jun 2007)
New Revision: 3528
Added:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java
Removed:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
Log:
Install backward compatible context-root,url-pattern deployers by default
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-11 06:16:09 UTC (rev 3527)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-11 08:29:33 UTC (rev 3528)
@@ -22,20 +22,16 @@
<!-- Deploy jbossws to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50">
-
<macro-deploy-native50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
-
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
-
- <antcall target="deploy-jboss50-cts"/>
</target>
<target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
@@ -45,11 +41,6 @@
thirdpartylibs="${core.dir}/thirdparty"/>
</target>
- <target name="deploy-jboss50-cts" if="jboss.server.instance.cts">
- <copy tofile="${jboss50.server.deploy}/jbossws.sar/META-INF/jbossws-beans.xml"
- file="${int.native.dir}/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml"/>
- </target>
-
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
@@ -62,14 +53,12 @@
<!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42">
-
<macro-deploy-native42
spilibs="${spi.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-spi
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
@@ -96,14 +85,12 @@
<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
spilibs="${spi.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-spi
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
Deleted: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml 2007-06-11 06:16:09 UTC (rev 3527)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml 2007-06-11 08:29:33 UTC (rev 3528)
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
- <!--
- 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 and port 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.stack.jbws.ManagedEndpointRegistry"/>
-
- <!-- 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>
-
- <!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
-
- <!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
-
- <!--
- *********************************************************************************************************************
- Web Service deployment
-
- There are three deployers registered with the JBoss Main Deployer.
- The order of which is important
-
- 1) EJBDeployer < WebServiceDeployerEJB
- 2) WebServiceDeployerJSE < WarDeployer
- 3) WebServiceMainDeployer
-
- Each WebServiceDeployer has a number of DeployerHooks registerd with it
-
- - WebServiceDeployerEJB
- - WSDeployerHook_JAXRPC_EJB21
- - WSDeployerHook_JAXWS_EJB3
-
- - WebServiceDeployerJSE
- - WSDeployerHook_JAXRPC_JSE
- - WSDeployerHook_JAXWS_JSE
-
- - WebServiceMainDeployer
- - WSMainDeployerHook
-
- Conceptually, each of these hooks implements the following pattern:
-
- DployerHook.deploy(unit)
- if(isWebServiceDeployment)
- Deployment dep = createDeployment(unit)
- DeployerManager.deploy(dep)
-
- DeployerHook.undeploy(unit)
- Deployment dep = getDeployment(unit)
- DeployerManager.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.
-
- *********************************************************************************************************************
- -->
-
- <!--
- Each DeploymentManger maintains a list of Deployers
- Each Deployer handles a single aspect of web service deployment.
- -->
- <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
- <property name="deployers">
- <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
- <inject bean="WSUnifiedDeploymentInfoDeployer"/>
- <inject bean="WSContextRootDeployer"/>
- <inject bean="WSURLPatternDeployer"/>
- <inject bean="WSUnifiedMetaDataDeployer"/>
- <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
- <inject bean="WSModifyWebMetaDataDeployer"/>
- </list>
- </property>
- </bean>
- <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
- <property name="deployers">
- <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
- <inject bean="WSUnifiedDeploymentInfoDeployer"/>
- <inject bean="WSContextRootDeployer"/>
- <inject bean="WSURLPatternDeployer"/>
- <inject bean="WSUnifiedMetaDataDeployer"/>
- <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
- <inject bean="WSWebAppGeneratorDeployer"/>
- <inject bean="WSWebAppDeployerDeployer"/>
- </list>
- </property>
- </bean>
- <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
- <property name="deployers">
- <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
- <inject bean="WSEndpointNameDeployer"/>
- <inject bean="WSEndpointHandlerDeployer"/>
- <inject bean="WSPublishContractDeployer"/>
- <inject bean="WSClassLoaderInjectionDeployer"/>
- <inject bean="WSServiceEndpointInvokerDeployer"/>
- <inject bean="WSEagerInitializeDeployer"/>
- <inject bean="WSEventingDeployer"/>
- <inject bean="WSEndpointRegistryDeployer"/>
- <inject bean="WSEndpointLifecycleDeployer"/>
- </list>
- </property>
- </bean>
-
- <!--
- The Deployers
- Each handles a single aspect of web service deployment
- -->
- <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/>
- <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
- <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
- <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
- <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
- <property name="invocationHandler">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
- <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry>
- <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry>
- <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry>
- </map>
- </property>
- </bean>
- <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
- <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
- <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
- <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer">
- <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property>
- </bean>
- <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/>
- <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>
- <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
- <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.LegacyURLPatternDeployer"/>
- <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
- <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
- <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
- <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer">
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
-
- <!-- Deployer helper beans -->
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
- <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
- </bean>
- <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
- <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
- </bean>
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
- <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE">
- <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
- <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
- <install bean="WebServiceDeployerJSE" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerJSE</depends>
- </bean>
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21">
- <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
- <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
- <install bean="WebServiceDeployerEJB" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerEJB</depends>
- </bean>
- <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE">
- <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
- <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
- <install bean="WebServiceDeployerJSE" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerJSE</depends>
- </bean>
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3">
- <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
- <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
- <install bean="WebServiceDeployerEJB" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerEJB</depends>
- </bean>
- <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook">
- <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
- <install bean="WebServiceMainDeployer" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceMainDeployer</depends>
- </bean>
-
-</deployment>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-11 06:16:09 UTC (rev 3527)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-11 08:29:33 UTC (rev 3528)
@@ -135,7 +135,7 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.BackwardCompatibleContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
@@ -161,7 +161,7 @@
<bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.BackwardCompatibleURLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java (from rev 3526, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java 2007-06-11 08:29:33 UTC (rev 3528)
@@ -0,0 +1,86 @@
+/*
+ * 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.ws.core.server;
+
+//$Id$
+
+import org.jboss.wsf.spi.deployment.ContextRootDeployer;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+
+/**
+ * A deployer that assigns the context root to the service.
+ *
+ * If there is no explicit <context-root>, this deployer uses
+ * the first token from the <port-component-uri> element.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class BackwardCompatibleContextRootDeployer extends ContextRootDeployer
+{
+ @Override
+ protected String getExplicitContextRoot(Deployment dep)
+ {
+ String contextRoot = super.getExplicitContextRoot(dep);
+ if (contextRoot == null)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ String urlPattern = getUrlPattern(dep, ep);
+ if (urlPattern != null)
+ {
+ String[] tokens = urlPattern.split("/");
+ if (tokens.length > 1)
+ {
+ if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
+ throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + tokens[0]);
+
+ contextRoot = tokens[0];
+ }
+ }
+ }
+ }
+ return contextRoot;
+ }
+
+ private String getUrlPattern(Deployment dep, Endpoint ep)
+ {
+ String urlPattern = null;
+
+ UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
+ if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null)
+ {
+ UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName());
+ UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ urlPattern = pcmd.getPortComponentURI();
+ }
+ }
+
+ return urlPattern;
+ }
+}
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java (from rev 3526, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java 2007-06-11 08:29:33 UTC (rev 3528)
@@ -0,0 +1,63 @@
+/*
+ * 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.ws.core.server;
+
+//$Id$
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.URLPatternDeployer;
+
+/**
+ * A deployer that assigns the URLPattern to endpoints.
+ *
+ * This deployer uses the first token from the <port-component-uri>
+ * as the context root.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 19-May-2007
+ */
+public class BackwardCompatibleURLPatternDeployer extends URLPatternDeployer
+{
+
+ @Override
+ protected String getExplicitPattern(Deployment dep, Endpoint ep)
+ {
+ String contextRoot = dep.getService().getContextRoot();
+ if (contextRoot == null)
+ throw new IllegalStateException("Cannot obtain context root");
+
+ String urlPattern = super.getExplicitPattern(dep, ep);
+ if (urlPattern != null)
+ {
+ if (urlPattern.startsWith("/") == false)
+ urlPattern = "/" + urlPattern;
+
+ String[] tokens = urlPattern.split("/");
+ if (tokens.length > 1 && urlPattern.startsWith(contextRoot))
+ {
+ urlPattern = urlPattern.substring(contextRoot.length());
+ }
+ }
+ return urlPattern;
+ }
+}
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-11 06:16:09 UTC (rev 3527)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-11 08:29:33 UTC (rev 3528)
@@ -1,86 +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.ws.core.server;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.ContextRootDeployer;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-
-/**
- * A deployer that assigns the context root to the service.
- *
- * This deployer uses the first token from the <port-component-uri>
- * as the context root.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class LegacyContextRootDeployer extends ContextRootDeployer
-{
- @Override
- protected String getExplicitContextRoot(Deployment dep)
- {
- String contextRoot = super.getExplicitContextRoot(dep);
- if (contextRoot == null)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- String urlPattern = getUrlPattern(dep, ep);
- if (urlPattern != null)
- {
- String[] tokens = urlPattern.split("/");
- if (tokens.length > 1)
- {
- if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
- throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + tokens[0]);
-
- contextRoot = tokens[0];
- }
- }
- }
- }
- return contextRoot;
- }
-
- private String getUrlPattern(Deployment dep, Endpoint ep)
- {
- String urlPattern = null;
-
- UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
- if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null)
- {
- UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName());
- UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent();
- if (pcmd != null)
- {
- urlPattern = pcmd.getPortComponentURI();
- }
- }
-
- return urlPattern;
- }
-}
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java 2007-06-11 06:16:09 UTC (rev 3527)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java 2007-06-11 08:29:33 UTC (rev 3528)
@@ -1,63 +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.ws.core.server;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.URLPatternDeployer;
-
-/**
- * A deployer that assigns the URLPattern to endpoints.
- *
- * This deployer uses the first token from the <port-component-uri>
- * as the context root.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 19-May-2007
- */
-public class LegacyURLPatternDeployer extends URLPatternDeployer
-{
-
- @Override
- protected String getExplicitPattern(Deployment dep, Endpoint ep)
- {
- String contextRoot = dep.getService().getContextRoot();
- if (contextRoot == null)
- throw new IllegalStateException("Cannot obtain context root");
-
- String urlPattern = super.getExplicitPattern(dep, ep);
- if (urlPattern != null)
- {
- if (urlPattern.startsWith("/") == false)
- urlPattern = "/" + urlPattern;
-
- String[] tokens = urlPattern.split("/");
- if (tokens.length > 1 && urlPattern.startsWith(contextRoot))
- {
- urlPattern = urlPattern.substring(contextRoot.length());
- }
- }
- return urlPattern;
- }
-}
\ No newline at end of file
18 years, 10 months
- 1
- 0
JBossWS SVN: r3527 - branches/jbossws-2.0/integration/native.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-11 02:16:09 -0400 (Mon, 11 Jun 2007)
New Revision: 3527
Modified:
branches/jbossws-2.0/integration/native/build.xml
Log:
Include jaxrpc,saaj in jboss42 sar
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-06-10 16:48:55 UTC (rev 3526)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-06-11 06:16:09 UTC (rev 3527)
@@ -187,6 +187,8 @@
</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="${core.dir}/thirdparty">
18 years, 10 months
- 1
- 0
JBossWS SVN: r3526 - in branches/jbossws-2.0/integration/native: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-10 12:48:55 -0400 (Sun, 10 Jun 2007)
New Revision: 3526
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/build.xml
Log:
Fix distribution targets
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-10 16:48:11 UTC (rev 3525)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-10 16:48:55 UTC (rev 3526)
@@ -13,6 +13,9 @@
<project>
+ <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
+ <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-06-10 16:48:11 UTC (rev 3525)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-06-10 16:48:55 UTC (rev 3526)
@@ -20,8 +20,6 @@
<import file="${int.native.dir}/ant-import/build-release.xml"/>
<import file="${int.native.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>
- <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
18 years, 10 months
- 1
- 0
JBossWS SVN: r3525 - in branches/jbossws-2.0/integration/native: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-10 12:48:11 -0400 (Sun, 10 Jun 2007)
New Revision: 3525
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/build.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
Log:
Fix distribution targets
Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-10 16:48:11 UTC (rev 3525)
@@ -62,7 +62,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
+ <fileset dir="${spi.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-10 16:48:11 UTC (rev 3525)
@@ -13,9 +13,6 @@
<project>
- <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
-
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-06-10 16:48:11 UTC (rev 3525)
@@ -20,6 +20,8 @@
<import file="${int.native.dir}/ant-import/build-release.xml"/>
<import file="${int.native.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
+ <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-10 16:48:11 UTC (rev 3525)
@@ -133,6 +133,11 @@
<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 -->
<!-- ================================================================== -->
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-10 16:48:11 UTC (rev 3525)
@@ -27,7 +27,6 @@
thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"
jbosshome="${jboss50.home}"/>
</target>
@@ -54,7 +53,6 @@
thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"
jbosshome="${jboss42.home}"/>
</target>
@@ -87,7 +85,6 @@
<macro-deploy-spi
spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"
jbosshome="${jboss40.home}"/>
</target>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3524 - branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-09 13:28:37 -0400 (Sat, 09 Jun 2007)
New Revision: 3524
Modified:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
Log:
Fix EJB21 endpoint handler callback
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-06-09 17:23:17 UTC (rev 3523)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-06-09 17:28:37 UTC (rev 3524)
@@ -123,33 +123,12 @@
{
log.debug("Invoke: " + inv.getJavaMethod().getName());
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
- Principal principal = securityAdaptor.getPrincipal();
- Object credential = securityAdaptor.getCredential();
-
// invoke on the container
try
{
// setup the invocation
- Method method = inv.getJavaMethod();
- Object[] args = inv.getArgs();
- org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+ org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv);
- // EJB2.1 endpoints will only get an JAXRPC context
- MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
- if (msgContext == null)
- throw new IllegalStateException("Cannot obtain MessageContext");
-
- HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
- if (callback == null)
- throw new IllegalStateException("Cannot obtain HandlerCallback");
-
- jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
- jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
- jbInv.setType(InvocationType.SERVICE_ENDPOINT);
- jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
- jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
-
String[] sig = { org.jboss.invocation.Invocation.class.getName() };
Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig);
inv.setReturnValue(retObj);
@@ -159,4 +138,32 @@
handleInvocationException(e);
}
}
+
+ private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv)
+ {
+ // EJB2.1 endpoints will only get an JAXRPC context
+ MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
+ if (msgContext == null)
+ throw new IllegalStateException("Cannot obtain MessageContext");
+
+ SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+ Principal principal = securityAdaptor.getPrincipal();
+ Object credential = securityAdaptor.getCredential();
+
+ Method method = inv.getJavaMethod();
+ Object[] args = inv.getArgs();
+ org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+
+ HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
+ if (callback == null)
+ throw new IllegalStateException("Cannot obtain HandlerCallback");
+
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
+ jbInv.setType(InvocationType.SERVICE_ENDPOINT);
+ jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
+ jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
+
+ return jbInv;
+ }
}
18 years, 10 months
- 1
- 0
JBossWS SVN: r3523 - in branches/jbossws-2.0: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-09 13:23:17 -0400 (Sat, 09 Jun 2007)
New Revision: 3523
Added:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java
Modified:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java
Log:
Fix EJB21 endpoint handler callback
Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java
===================================================================
--- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -71,8 +71,8 @@
try
{
// call the request handlers
- boolean handlersPass = callback.callRequestHandlerChain(HandlerType.ENDPOINT);
- handlersPass = handlersPass && callback.callRequestHandlerChain(HandlerType.POST);
+ boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT);
+ handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST);
// Call the next interceptor in the chain
if (handlersPass)
@@ -90,8 +90,8 @@
}
// call the response handlers
- handlersPass = callback.callResponseHandlerChain(HandlerType.POST);
- handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT);
+ handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST);
+ handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT);
// update the return value after response handler processing
Object resObj = wsInv.getReturnValue();
@@ -103,8 +103,8 @@
try
{
// call the fault handlers
- boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex);
- handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex);
+ boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex);
+ handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex);
}
catch (Exception subEx)
{
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -125,40 +125,12 @@
{
log.debug("Invoke: " + inv.getJavaMethod().getName());
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
- SecurityContext sc = SecurityContextAssociation.getSecurityContext();
- Principal principal = securityAdaptor.getPrincipal();
- Object credential = securityAdaptor.getCredential();
-
- if (principal == null && sc != null)
- principal = sc.getUtil().getUserPrincipal();
-
- if (credential == null && sc != null)
- credential = sc.getUtil().getCredential();
-
// invoke on the container
try
{
// setup the invocation
- Method method = inv.getJavaMethod();
- Object[] args = inv.getArgs();
- org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+ org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv);
- // EJB2.1 endpoints will only get an JAXRPC context
- MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
- if (msgContext == null)
- throw new IllegalStateException("Cannot obtain MessageContext");
-
- HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
- if (callback == null)
- throw new IllegalStateException("Cannot obtain HandlerCallback");
-
- jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
- jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
- jbInv.setType(InvocationType.SERVICE_ENDPOINT);
- jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
- jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
-
String[] sig = { org.jboss.invocation.Invocation.class.getName() };
Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig);
inv.setReturnValue(retObj);
@@ -168,4 +140,39 @@
handleInvocationException(e);
}
}
+
+ private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv)
+ {
+ // EJB2.1 endpoints will only get an JAXRPC context
+ MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
+ if (msgContext == null)
+ throw new IllegalStateException("Cannot obtain MessageContext");
+
+ SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+ SecurityContext sc = SecurityContextAssociation.getSecurityContext();
+ Principal principal = securityAdaptor.getPrincipal();
+ Object credential = securityAdaptor.getCredential();
+
+ if (principal == null && sc != null)
+ principal = sc.getUtil().getUserPrincipal();
+
+ if (credential == null && sc != null)
+ credential = sc.getUtil().getCredential();
+
+ Method method = inv.getJavaMethod();
+ Object[] args = inv.getArgs();
+ org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+
+ HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
+ if (callback == null)
+ throw new IllegalStateException("Cannot obtain HandlerCallback");
+
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
+ jbInv.setType(InvocationType.SERVICE_ENDPOINT);
+ jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
+ jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
+
+ return jbInv;
+ }
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -71,8 +71,8 @@
try
{
// call the request handlers
- boolean handlersPass = callback.callRequestHandlerChain(HandlerType.ENDPOINT);
- handlersPass = handlersPass && callback.callRequestHandlerChain(HandlerType.POST);
+ boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT);
+ handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST);
// Call the next interceptor in the chain
if (handlersPass)
@@ -90,8 +90,8 @@
}
// call the response handlers
- handlersPass = callback.callResponseHandlerChain(HandlerType.POST);
- handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT);
+ handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST);
+ handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT);
// update the return value after response handler processing
Object resObj = wsInv.getReturnValue();
@@ -103,8 +103,8 @@
try
{
// call the fault handlers
- boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex);
- handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex);
+ boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex);
+ handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex);
}
catch (Exception subEx)
{
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/HandlerCallback.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -34,11 +34,11 @@
public interface HandlerCallback
{
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- boolean callRequestHandlerChain(HandlerType type);
+ boolean callRequestHandlerChain(Invocation wsInv, HandlerType type);
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- boolean callResponseHandlerChain(HandlerType type);
+ boolean callResponseHandlerChain(Invocation wsInv, HandlerType type);
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- boolean callFaultHandlerChain(HandlerType type, Exception ex);
+ boolean callFaultHandlerChain(Invocation wsInv, HandlerType type, Exception ex);
}
\ No newline at end of file
Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -0,0 +1,97 @@
+/*
+ * 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.ws.core.server;
+
+// $Id$
+
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonBinding;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.jboss.wsf.spi.invocation.BasicEndpointInvocation;
+
+/** An invocation that delegates to the jbossws-core EndpointInvocation
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DelegatingInvocation extends BasicEndpointInvocation
+{
+ private EndpointInvocation getEndpointInvocation()
+ {
+ EndpointInvocation epInv = getInvocationContext().getAttachment(EndpointInvocation.class);
+ if (epInv == null)
+ throw new IllegalStateException("Cannot obtain endpoint invocation");
+
+ return epInv;
+ }
+
+ @Override
+ public void setReturnValue(Object value)
+ {
+ EndpointInvocation epInv = getEndpointInvocation();
+ epInv.setReturnValue(value);
+
+ SOAPMessageContext msgContext = (SOAPMessageContext)getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class);
+ if (msgContext != null && msgContext.getMessage() == null)
+ {
+ try
+ {
+ // Bind the response message
+ OperationMetaData opMetaData = epInv.getOperationMetaData();
+ CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData());
+ CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding();
+ SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv);
+ msgContext.setMessage(resMessage);
+ }
+ catch (BindingException ex)
+ {
+ WSException.rethrow(ex);
+ }
+ }
+ }
+
+ @Override
+ public Object[] getArgs()
+ {
+ EndpointInvocation epInv = getEndpointInvocation();
+ return epInv.getRequestPayload();
+ }
+
+ @Override
+ public Object getReturnValue()
+ {
+ EndpointInvocation epInv = getEndpointInvocation();
+ return epInv.getReturnValue();
+ }
+
+ @Override
+ public void setArgs(Object[] args)
+ {
+ throw new IllegalArgumentException("Cannot set args on this invocation");
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -25,36 +25,30 @@
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.util.Iterator;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.rpc.server.ServletEndpointContext;
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPMessage;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.http.HTTPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPBinding;
import org.jboss.ws.core.DirectionHolder;
-import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.DirectionHolder.Direction;
import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC;
import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
@@ -70,7 +64,6 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.BasicEndpointInvocation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -207,6 +200,9 @@
Invocation inv = setupInvocation(endpoint, sepInv, invContext);
InvocationHandler invHandler = endpoint.getInvocationHandler();
invHandler.invoke(endpoint, null, inv);
+
+ // Handler processing might have replaced the endpoint invocation
+ sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class);
}
finally
{
@@ -279,7 +275,7 @@
}
}
- protected Invocation setupInvocation(Endpoint ep, EndpointInvocation sepInv, InvocationContext invContext) throws Exception
+ protected Invocation setupInvocation(Endpoint ep, EndpointInvocation epInv, InvocationContext invContext) throws Exception
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXWS)
@@ -297,11 +293,13 @@
invContext.addAttachment(ServletEndpointContext.class, servletEndpointContext);
}
- Invocation inv = new DelegatingInvocation(sepInv);
- inv.setInvocationContext(invContext);
- inv.setJavaMethod(getImplMethod(endpoint, sepInv));
+ invContext.addAttachment(EndpointInvocation.class, epInv);
+
+ Invocation wsInv = new DelegatingInvocation();
+ wsInv.setInvocationContext(invContext);
+ wsInv.setJavaMethod(getImplMethod(endpoint, epInv));
- return inv;
+ return wsInv;
}
protected Method getImplMethod(Endpoint endpoint, EndpointInvocation sepInv) throws ClassNotFoundException, NoSuchMethodException
@@ -397,7 +395,7 @@
if (opMetaData == null)
{
String faultString;
-
+
SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
if (soapBodyElement != null)
@@ -426,56 +424,4 @@
}
return opMetaData;
}
-
- class DelegatingInvocation extends BasicEndpointInvocation
- {
- private EndpointInvocation sepInv;
-
- public DelegatingInvocation(EndpointInvocation sepInv)
- {
- this.sepInv = sepInv;
- }
-
- @Override
- public void setReturnValue(Object value)
- {
- sepInv.setReturnValue(value);
-
- SOAPMessageContext msgContext = (SOAPMessageContext)getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class);
- if (msgContext != null && msgContext.getMessage() == null)
- {
- try
- {
- // Bind the response message
- OperationMetaData opMetaData = sepInv.getOperationMetaData();
- CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData());
- CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding();
- SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, sepInv);
- msgContext.setMessage(resMessage);
- }
- catch (BindingException ex)
- {
- WSException.rethrow(ex);
- }
- }
- }
-
- @Override
- public Object[] getArgs()
- {
- return sepInv.getRequestPayload();
- }
-
- @Override
- public Object getReturnValue()
- {
- return sepInv.getReturnValue();
- }
-
- @Override
- public void setArgs(Object[] args)
- {
- throw new IllegalArgumentException("Cannot set args on this invocation");
- }
- }
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-06-09 15:17:03 UTC (rev 3522)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-06-09 17:23:17 UTC (rev 3523)
@@ -23,11 +23,19 @@
// $Id$
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonBinding;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.HandlerCallback;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -39,6 +47,9 @@
*/
public class ServiceEndpointInvokerEJB21 extends ServiceEndpointInvoker
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceEndpointInvokerEJB21.class);
+
@Override
protected Invocation setupInvocation(Endpoint ep, EndpointInvocation epInv, InvocationContext invContext) throws Exception
{
@@ -89,15 +100,42 @@
}
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- public boolean callRequestHandlerChain(HandlerType type)
+ public boolean callRequestHandlerChain(Invocation wsInv, HandlerType type)
{
- if (type == HandlerType.PRE)
- return true;
- else return delegate.callRequestHandlerChain(sepMetaData, type);
+ boolean handlerPass = true;
+ if (type == HandlerType.ENDPOINT)
+ {
+ handlerPass = delegate.callRequestHandlerChain(sepMetaData, type);
+ }
+ else if (type == HandlerType.POST)
+ {
+ handlerPass = delegate.callRequestHandlerChain(sepMetaData, type);
+
+ // Verify that the the message has not been mofified
+ CommonMessageContext messageContext = MessageContextAssociation.peekMessageContext();
+ if(handlerPass && messageContext.isModified())
+ {
+ try
+ {
+ OperationMetaData opMetaData = messageContext.getOperationMetaData();
+ CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData());
+ CommonBinding binding = bindingProvider.getCommonBinding();
+
+ log.debug("Handler modified payload, unbind message and update invocation args");
+ EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, messageContext.getMessageAbstraction());
+ wsInv.getInvocationContext().addAttachment(EndpointInvocation.class, epInv);
+ }
+ catch (BindingException ex)
+ {
+ throw new WSException(ex);
+ }
+ }
+ }
+ return handlerPass;
}
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- public boolean callResponseHandlerChain(HandlerType type)
+ public boolean callResponseHandlerChain(Invocation wsInv, HandlerType type)
{
if (type == HandlerType.PRE)
return true;
@@ -105,7 +143,7 @@
}
/** Handlers are beeing called through the HandlerCallback from the EJB interceptor */
- public boolean callFaultHandlerChain(HandlerType type, Exception ex)
+ public boolean callFaultHandlerChain(Invocation wsInv, HandlerType type, Exception ex)
{
if (type == HandlerType.PRE)
return true;
18 years, 10 months
- 1
- 0
JBossWS SVN: r3522 - in branches/jbossws-2.0: integration/spi/ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-09 11:17:03 -0400 (Sat, 09 Jun 2007)
New Revision: 3522
Modified:
branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml
branches/jbossws-2.0/testsuite/.classpath
Log:
Fix eclipse classpaths
Modified: branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
===================================================================
--- branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-09 14:59:33 UTC (rev 3521)
+++ branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-09 15:17:03 UTC (rev 3522)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<eclipse-userlibraries version="2">
<library name="jboss-4.0.x" systemlibrary="false">
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/lib/jboss-common.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/lib/jboss-jmx.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/lib/jboss-common.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/lib/jboss.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-container.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
</library>
Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-09 14:59:33 UTC (rev 3521)
+++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-09 15:17:03 UTC (rev 3522)
@@ -57,6 +57,7 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-2.0/testsuite/.classpath
===================================================================
--- branches/jbossws-2.0/testsuite/.classpath 2007-06-09 14:59:33 UTC (rev 3521)
+++ branches/jbossws-2.0/testsuite/.classpath 2007-06-09 15:17:03 UTC (rev 3522)
@@ -13,5 +13,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
18 years, 10 months
- 1
- 0
JBossWS SVN: r3521 - in branches/jbossws-2.0: integration/native and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-09 10:59:33 -0400 (Sat, 09 Jun 2007)
New Revision: 3521
Added:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml
Modified:
branches/jbossws-2.0/build/ant-import/build-setup.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/build.xml
Log:
Add cts configuration
Modified: branches/jbossws-2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:11:15 UTC (rev 3520)
+++ branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:59:33 UTC (rev 3521)
@@ -53,6 +53,7 @@
<property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss.server.instance.${jboss.server.instance}" 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"/>
@@ -61,7 +62,6 @@
<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"/>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:59:33 UTC (rev 3521)
@@ -34,6 +34,8 @@
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
+
+ <antcall target="deploy-jboss50-cts"/>
</target>
<target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
@@ -43,6 +45,11 @@
thirdpartylibs="${core.dir}/thirdparty"/>
</target>
+ <target name="deploy-jboss50-cts" if="jboss.server.instance.cts">
+ <copy tofile="${jboss50.server.deploy}/jbossws.sar/META-INF/jbossws-beans.xml"
+ file="${int.native.dir}/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml"/>
+ </target>
+
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-06-09 14:11:15 UTC (rev 3520)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-06-09 14:59:33 UTC (rev 3521)
@@ -158,7 +158,9 @@
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
</metainf>
- <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"/>
+ <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF">
+ <include name="jbossws-beans.xml"/>
+ </metainf>
</jar>
<!-- Build jbossws-native50.deployer -->
Added: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml (rev 0)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml 2007-06-09 14:59:33 UTC (rev 3521)
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
+ <!--
+ 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 and port 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.stack.jbws.ManagedEndpointRegistry"/>
+
+ <!-- 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>
+
+ <!-- Bind Service objects in client environment context -->
+ <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployers registered with the JBoss Main Deployer.
+ The order of which is important
+
+ 1) EJBDeployer < WebServiceDeployerEJB
+ 2) WebServiceDeployerJSE < WarDeployer
+ 3) WebServiceMainDeployer
+
+ Each WebServiceDeployer has a number of DeployerHooks registerd with it
+
+ - WebServiceDeployerEJB
+ - WSDeployerHook_JAXRPC_EJB21
+ - WSDeployerHook_JAXWS_EJB3
+
+ - WebServiceDeployerJSE
+ - WSDeployerHook_JAXRPC_JSE
+ - WSDeployerHook_JAXWS_JSE
+
+ - WebServiceMainDeployer
+ - WSMainDeployerHook
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeployerManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeployerManager.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.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Each DeploymentManger maintains a list of Deployers
+ Each Deployer handles a single aspect of web service deployment.
+ -->
+ <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSUnifiedMetaDataDeployer"/>
+ <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
+ <inject bean="WSModifyWebMetaDataDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSUnifiedMetaDataDeployer"/>
+ <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
+ <inject bean="WSWebAppGeneratorDeployer"/>
+ <inject bean="WSWebAppDeployerDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSEndpointNameDeployer"/>
+ <inject bean="WSEndpointHandlerDeployer"/>
+ <inject bean="WSPublishContractDeployer"/>
+ <inject bean="WSClassLoaderInjectionDeployer"/>
+ <inject bean="WSServiceEndpointInvokerDeployer"/>
+ <inject bean="WSEagerInitializeDeployer"/>
+ <inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointRegistryDeployer"/>
+ <inject bean="WSEndpointLifecycleDeployer"/>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ The Deployers
+ Each handles a single aspect of web service deployment
+ -->
+ <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/>
+ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
+ <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
+ <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="invocationHandler">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
+ <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry>
+ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
+ <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer">
+ <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property>
+ </bean>
+ <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/>
+ <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
+ <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.LegacyURLPatternDeployer"/>
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+ <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+
+ <!-- Deployer helper beans -->
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
+ <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
+ </bean>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+ <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <install bean="WebServiceDeployerJSE" method="addDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>WebServiceDeployerJSE</depends>
+ </bean>
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <install bean="WebServiceDeployerEJB" method="addDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>WebServiceDeployerEJB</depends>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <install bean="WebServiceDeployerJSE" method="addDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>WebServiceDeployerJSE</depends>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <install bean="WebServiceDeployerEJB" method="addDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>WebServiceDeployerEJB</depends>
+ </bean>
+ <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook">
+ <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
+ <install bean="WebServiceMainDeployer" method="addDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>WebServiceMainDeployer</depends>
+ </bean>
+
+</deployment>
Property changes on: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r3520 - in branches/jbossws-2.0: integration/native/ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-09 10:11:15 -0400 (Sat, 09 Jun 2007)
New Revision: 3520
Modified:
branches/jbossws-2.0/build/ant-import/build-setup.xml
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
Log:
Add deployment to lib/endorsed for jdk1.6
Modified: branches/jbossws-2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -66,6 +66,12 @@
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+ <!-- 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"/>
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -136,8 +136,8 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.lib}/endorsed/jaxb-api.jar"/>
<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-client.jar"/>
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -21,28 +21,41 @@
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50">
+ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50">
+
<macro-deploy-native50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
-
+
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</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" description="Remove jbossws from jboss50">
+ <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
<macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
+
+ <target name="undeploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss50.home}"/>
+ </target>
<!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42">
+ <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42">
+
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
@@ -55,17 +68,28 @@
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</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" description="Remove jbossws from jboss42">
+ <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws 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 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
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -135,18 +135,6 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <!-- ENDORSED -->
- <copy todir="${jboss42.home}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
<!-- BIN SCRIPTS -->
<unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
@@ -157,9 +145,13 @@
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="@{corelibs}">
+ <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="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
<include name="wsdl4j.jar"/>
@@ -189,11 +181,6 @@
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<delete>
- <!-- ENDORSED -->
- <fileset dir="${jboss42.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
-
<!-- BIN SCRIPTS -->
<fileset dir="${jboss42.home}/bin">
<include name="wsconsume.*"/>
@@ -363,5 +350,39 @@
<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="corelibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <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: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -59,6 +59,12 @@
<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"/>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -18,21 +18,25 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/native to jboss50">
+ <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50">
<macro-deploy-native50
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
-
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.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">
@@ -41,27 +45,34 @@
</target>
<!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/native to jboss42">
+ <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42">
<macro-deploy-native42
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
-
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.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" description="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"/>
@@ -72,8 +83,7 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -135,7 +135,7 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
@@ -161,7 +161,7 @@
<bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.LegacyURLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-09 14:11:15 UTC (rev 3520)
@@ -55,6 +55,9 @@
String[] tokens = urlPattern.split("/");
if (tokens.length > 1)
{
+ if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
+ throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + tokens[0]);
+
contextRoot = tokens[0];
}
}
18 years, 10 months
- 1
- 0