[jbossws-commits] JBossWS SVN: r2851 - in trunk: build/eclipse and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Apr 14 13:48:18 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-04-14 13:48:18 -0400 (Sat, 14 Apr 2007)
New Revision: 2851
Added:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
Modified:
trunk/build/ant-import/build-samples.xml
trunk/build/eclipse/jbossws.userlibraries
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-core/src/resources/samples/ant.properties.example
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
Log:
Migrate web context handling to jbossws
Modified: trunk/build/ant-import/build-samples.xml
===================================================================
--- trunk/build/ant-import/build-samples.xml 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/build/ant-import/build-samples.xml 2007-04-14 17:48:18 UTC (rev 2851)
@@ -21,12 +21,15 @@
<property name="samples.target" value="jbossws-samples-${version.id}"/>
<property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/>
- <copy todir="${build.src.samples.dir}">
+ <copy todir="${build.src.samples.dir}" filtering="true">
<fileset dir="${core.samples.dir}">
<include name="ant-import/build-thirdparty.xml"/>
<include name="ant.properties.example"/>
<include name="build.xml"/>
</fileset>
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
</copy>
<!--copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/-->
Modified: trunk/build/eclipse/jbossws.userlibraries
===================================================================
--- trunk/build/eclipse/jbossws.userlibraries 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/build/eclipse/jbossws.userlibraries 2007-04-14 17:48:18 UTC (rev 2851)
@@ -10,13 +10,13 @@
<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"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/lib/jboss-aop-jdk50.jar"/>
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -28,13 +28,6 @@
import java.util.List;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.metamodel.Ejb3PortComponent;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
@@ -61,80 +54,40 @@
// logging support
private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class);
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(DeploymentUnit unit, Ejb3Deployment ejb3Deployment)
+ public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(DeploymentUnit unit)
{
+ ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>();
- Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- buildUnifiedBeanMetaData(ubmdList, container);
- }
- umd.setEnterpriseBeans(ubmdList);
+ buildUnifiedBeanMetaData(umd, appMetaData);
+ buildWebservicesMetaData(umd, appMetaData);
+ umd.setSecurityDomain(appMetaData.getSecurityDomain());
return umd;
}
- private static void buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> ubmdList, EJBContainer container)
- {
- UnifiedBeanMetaData ubmd = null;
- if (container instanceof SessionContainer)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (container instanceof MessagingContainer)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
- log.warn("No implemented: initialize MDB destination");
- //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(container.getEjbName());
- ubmd.setEjbClass(container.getBeanClassName());
-
- EnterpriseBean bean = container.getXml();
- Ejb3PortComponent portComp = (bean != null ? bean.getPortComponent() : null);
- if (portComp != null)
- {
- UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
- ejbPortComp.setPortComponentName(portComp.getPortComponentName());
- ejbPortComp.setPortComponentURI(portComp.getPortComponentURI());
- ejbPortComp.setAuthMethod(portComp.getAuthMethod());
- ejbPortComp.setTransportGuarantee(portComp.getTransportGuarantee());
- ejbPortComp.setSecureWSDLAccess(portComp.getSecureWSDLAccess());
-
- ubmd.setPortComponent(ejbPortComp);
- }
-
- ubmdList.add(ubmd);
- }
- }
-
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(DeploymentUnit unit, ApplicationMetaData apmd)
- {
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, apmd);
- buildWebservicesMetaData(umd, apmd);
- umd.setSecurityDomain(apmd.getSecurityDomain());
- return umd;
- }
-
+ // If you modify this, do it in ApplicationMetaDataAdaptorEJB3 as well
private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd)
{
Webservices webservices = apmd.getWebservices();
if (webservices != null)
{
- umd.setWebServiceContextRoot(webservices.getContextRoot());
+ String contextRoot = webservices.getContextRoot();
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
- if (webservices.getWebserviceDescriptions().size() > 1)
+ List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
+ if (wsDescriptions.size() > 1)
log.warn("Multiple <webservice-description> elements not supported");
- WebserviceDescription wsd = webservices.getWebserviceDescriptions().get(0);
- umd.setConfigName(wsd.getConfigName());
- umd.setConfigFile(wsd.getConfigFile());
+ if (wsDescriptions.size() > 0)
+ {
+ WebserviceDescription wsd = wsDescriptions.get(0);
+ umd.setConfigName(wsd.getConfigName());
+ umd.setConfigFile(wsd.getConfigFile());
+
+ if (contextRoot == null)
+ contextRoot = "/" + wsd.getDescriptionName();
+ }
+
+ umd.setWebServiceContextRoot(contextRoot);
}
}
@@ -157,23 +110,19 @@
};
}
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
+ private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData)
{
List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- Iterator it = metaData.getEnterpriseBeans();
+ Iterator it = appMetaData.getEnterpriseBeans();
while (it.hasNext())
{
BeanMetaData bmd = (BeanMetaData)it.next();
- UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
- if (ubmd != null)
- {
- beans.add(ubmd);
- }
+ buildUnifiedBeanMetaData(beans, bmd);
}
umd.setEnterpriseBeans(beans);
}
- private static UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
+ private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd)
{
UnifiedBeanMetaData ubmd = null;
if (bmd instanceof SessionMetaData)
@@ -207,6 +156,8 @@
upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
ubmd.setPortComponent(upcmd);
}
+
+ beans.add(ubmd);
}
return ubmd;
}
Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java (rev 0)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -0,0 +1,163 @@
+/*
+ * 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.integration.jboss50;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.SessionContainer;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.metamodel.Ejb3PortComponent;
+import org.jboss.ejb3.metamodel.EjbJarDD;
+import org.jboss.ejb3.metamodel.EnterpriseBean;
+import org.jboss.ejb3.metamodel.WebserviceDescription;
+import org.jboss.ejb3.metamodel.Webservices;
+import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Apr-2007
+ */
+public class ApplicationMetaDataAdaptorEJB3
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class);
+
+ public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(DeploymentUnit unit)
+ {
+ Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
+ EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class);
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, ejb3Deployment);
+ buildWebservicesMetaData(umd, jarDD);
+ return umd;
+ }
+
+ // If you modify this, do it in ApplicationMetaDataAdaptor as well
+ private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD)
+ {
+ // nothing to do
+ if (jarDD == null)
+ return;
+
+ Webservices webservices = jarDD.getWebservices();
+ if (webservices != null)
+ {
+ String contextRoot = webservices.getContextRoot();
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
+
+ List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
+ if (wsDescriptions.size() > 1)
+ log.warn("Multiple <webservice-description> elements not supported");
+
+ if (wsDescriptions.size() > 0)
+ {
+ WebserviceDescription wsd = wsDescriptions.get(0);
+ umd.setConfigName(wsd.getConfigName());
+ umd.setConfigFile(wsd.getConfigFile());
+
+ if (contextRoot == null)
+ contextRoot = "/" + wsd.getDescriptionName();
+ }
+
+ umd.setWebServiceContextRoot(contextRoot);
+ }
+ }
+
+ private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment)
+ {
+ List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>();
+ Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
+ while (it.hasNext())
+ {
+ EJBContainer container = (EJBContainer)it.next();
+ UnifiedBeanMetaData ubmd = null;
+ if (container instanceof SessionContainer)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (container instanceof MessagingContainer)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ log.warn("No implemented: initialize MDB destination");
+ //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(container.getEjbName());
+ ubmd.setEjbClass(container.getBeanClassName());
+
+ EnterpriseBean bean = container.getXml();
+ Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null);
+ if (pcMetaData != null)
+ {
+ UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
+ ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName());
+ ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI());
+ ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod());
+ ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee());
+ ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess());
+
+ ubmd.setPortComponent(ejbPortComp);
+ }
+
+ ubmdList.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(ubmdList);
+ }
+
+ private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ String wsdlPublishLocation = null;
+ for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
+ {
+ if (wsd.getDescriptionName().equals(name))
+ {
+ wsdlPublishLocation = wsd.getWsdlPublishLocation();
+ }
+ }
+ return wsdlPublishLocation;
+ }
+ };
+ }
+}
Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -81,13 +81,11 @@
{
if (unit.getAttachment(Ejb3Deployment.class) != null)
{
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(unit, ejb3Deployment);
+ udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(unit);
}
else if (unit.getAttachment(ApplicationMetaData.class) != null)
{
- ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
- udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(unit, appMetaData);
+ udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(unit);
}
else
{
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -57,7 +57,7 @@
public URL generatWebDeployment(UnifiedMetaData wsMetaData, DeploymentUnit unit)
{
- // Collect the list of PortComponentMetaData
+ // Collect the list of ServerEndpointMetaData
List<ServerEndpointMetaData> sepMetaDataList = new ArrayList<ServerEndpointMetaData>();
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -53,9 +53,6 @@
// default bean name
public static final String BEAN_NAME = "ServiceEndpointDeployer";
- // The servlet init param in web.xml that is the service endpoint class
- public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
-
// The ServiceEndpointManger injected by the kernel
private ServiceEndpointManager epManager;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -31,6 +31,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.StringTokenizer;
import javax.management.ObjectName;
import javax.wsdl.Definition;
@@ -128,11 +129,12 @@
}
}
- protected void initEndpointAddress(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String linkName)
+ protected void initEndpointAddress(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData)
{
// For JAXWS these may have been set by @WebContext attributes
String contextRoot = sepMetaData.getContextRoot();
String urlPattern = sepMetaData.getURLPattern();
+ String linkName = sepMetaData.getLinkName();
if (udi.metaData instanceof UnifiedWebMetaData)
{
@@ -163,8 +165,24 @@
{
String pcUrlPattern = ejbpcMetaData.getPortComponentURI();
if (pcUrlPattern != null)
+ {
urlPattern = pcUrlPattern;
+ StringTokenizer st = new StringTokenizer(urlPattern, "/");
+ if (contextRoot == null && st.countTokens() > 1)
+ {
+ contextRoot = st.nextToken();
+ urlPattern = st.nextToken();
+ while (st.hasMoreTokens())
+ urlPattern += "/" + st.nextToken();
+ }
+ }
}
+
+ if (urlPattern == null)
+ {
+ String ejbClass = beanMetaData.getEjbClass();
+ urlPattern = ejbClass.substring(ejbClass.lastIndexOf(".") + 1);
+ }
}
// If not, derive the context root from the deployment
@@ -184,8 +202,6 @@
if (contextRoot.startsWith("/") == false)
contextRoot = "/" + contextRoot;
- if (urlPattern == null)
- urlPattern = "/" + linkName;
if (urlPattern.startsWith("/") == false)
urlPattern = "/" + urlPattern;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -137,7 +137,7 @@
initEndpointEncodingStyle(sepMetaData);
- initEndpointAddress(udi, sepMetaData, linkName);
+ initEndpointAddress(udi, sepMetaData);
if (udi.metaData instanceof UnifiedApplicationMetaData)
{
@@ -177,8 +177,6 @@
Boolean secureWSDLAccess = bpcMetaData.getSecureWSDLAccess();
sepMetaData.setSecureWSDLAccess(secureWSDLAccess);
}
-
- sepMetaData.setURLPattern(bpcMetaData.getURLPattern());
}
}
else if (udi.metaData instanceof UnifiedWebMetaData)
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -137,7 +137,7 @@
processWebContext(udi, sepClass, linkName, sepMetaData);
// Init the endpoint address
- initEndpointAddress(udi, sepMetaData, linkName);
+ initEndpointAddress(udi, sepMetaData);
// A provider may not have a WSDL file
if (sepMetaData.getServiceMetaData().getWsdlLocation() != null)
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -161,7 +161,7 @@
processWSDDContribution(sepMetaData);
// Init the endpoint address
- initEndpointAddress(udi, sepMetaData, linkName);
+ initEndpointAddress(udi, sepMetaData);
// Process an optional @SOAPMessageHandlers annotation
if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || seiClass.isAnnotationPresent(SOAPMessageHandlers.class))
@@ -259,36 +259,36 @@
private EndpointResult processWebService(UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException, IOException
{
- WebService endpointImplAnnotation = sepClass.getAnnotation(WebService.class);
- if (endpointImplAnnotation == null)
+ WebService wsAnnotation = sepClass.getAnnotation(WebService.class);
+ if (wsAnnotation == null)
throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName());
Class<?> seiClass = null;
String seiName;
WSDLUtils wsdlUtils = WSDLUtils.getInstance();
- String name = endpointImplAnnotation.name();
+ String name = wsAnnotation.name();
if (name.length() == 0)
name = WSDLUtils.getJustClassName(sepClass);
- String serviceName = endpointImplAnnotation.serviceName();
+ String serviceName = wsAnnotation.serviceName();
if (serviceName.length() == 0)
serviceName = name + "Service";
- String serviceNS = endpointImplAnnotation.targetNamespace();
+ String serviceNS = wsAnnotation.targetNamespace();
if (serviceNS.length() == 0)
serviceNS = wsdlUtils.getTypeNamespace(sepClass);
- String portName = endpointImplAnnotation.portName();
+ String portName = wsAnnotation.portName();
if (portName.length() == 0)
portName = name + "Port";
- String wsdlLocation = endpointImplAnnotation.wsdlLocation();
+ String wsdlLocation = wsAnnotation.wsdlLocation();
String interfaceNS = serviceNS; // the default, but a SEI annotation may override this
- if (endpointImplAnnotation.endpointInterface().length() > 0)
+ if (wsAnnotation.endpointInterface().length() > 0)
{
- seiName = endpointImplAnnotation.endpointInterface();
+ seiName = wsAnnotation.endpointInterface();
seiClass = udi.classLoader.loadClass(seiName);
WebService seiAnnotation = seiClass.getAnnotation(WebService.class);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -117,6 +117,16 @@
this.sepID = endpointID;
}
+ public String[] getVirtualHosts()
+ {
+ return virtualHosts;
+ }
+
+ public void setVirtualHosts(String[] virtualHosts)
+ {
+ this.virtualHosts = virtualHosts;
+ }
+
public String getContextRoot()
{
return contextRoot;
@@ -130,16 +140,6 @@
this.contextRoot = contextRoot;
}
- public String[] getVirtualHosts()
- {
- return virtualHosts;
- }
-
- public void setVirtualHosts(String[] virtualHosts)
- {
- this.virtualHosts = virtualHosts;
- }
-
public String getURLPattern()
{
return urlPattern;
Modified: trunk/jbossws-core/src/resources/samples/ant.properties.example
===================================================================
--- trunk/jbossws-core/src/resources/samples/ant.properties.example 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-core/src/resources/samples/ant.properties.example 2007-04-14 17:48:18 UTC (rev 2851)
@@ -2,9 +2,9 @@
#
# Required JBoss Home
-jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2
-jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+jboss50.home=@jboss50.home@
+jboss42.home=@jboss42.home@
+jboss40.home=@jboss40.home@
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
jbossws.integration.target=jboss42
@@ -18,7 +18,7 @@
tomcat.manager.password=manager
# JBoss Repository
-jboss.repository=http://repository.jboss.com
+jboss.repository=@jboss.repository@
# Force thirdparty HTTP get
#force.thirdparty.get=true
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -52,7 +52,7 @@
// jboss propriatary annotations
@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01")
- at WebContext(contextRoot = "EJB3Bean01", authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false)
+ at WebContext(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false)
@SecurityDomain("JBossWS")
public class EJB3Bean01 implements EJB3RemoteInterface
{
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-04-14 17:48:18 UTC (rev 2851)
@@ -44,7 +44,7 @@
*/
public class StubPropertyTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure/SecureEndpoint";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl";
public static Test suite()
{
Modified: trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-04-14 17:46:29 UTC (rev 2850)
+++ trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-04-14 17:48:18 UTC (rev 2851)
@@ -21,7 +21,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
<service-ref>
@@ -37,7 +37,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
<service-ref>
@@ -53,7 +53,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
</jboss-client>
\ No newline at end of file
More information about the jbossws-commits
mailing list