JBossWS SVN: r2857 - trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 19:12:24 -0400 (Sat, 14 Apr 2007)
New Revision: 2857
Modified:
trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss.xml
Log:
Use explicit context root
Modified: trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss.xml 2007-04-14 22:37:18 UTC (rev 2856)
+++ trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss.xml 2007-04-14 23:12:24 UTC (rev 2857)
@@ -6,6 +6,7 @@
<security-domain>java:/jaas/JBossWS</security-domain>
<webservices>
+ <context-root>/jaxrpc-wsse-username</context-root>
<webservice-description>
<webservice-description-name>TestService</webservice-description-name>
<config-name>Standard WSSecurity Endpoint</config-name>
@@ -17,7 +18,7 @@
<ejb-name>TestService</ejb-name>
<port-component>
<port-component-name>TestServicePort</port-component-name>
- <port-component-uri>/jaxrpc-wsse-username/*</port-component-uri>
+ <port-component-uri>/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
17 years, 1 month
- 1
- 0
JBossWS SVN: r2856 - in trunk: jbossws-core/src/java/org/jboss/ws/metadata/builder and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 18:37:18 -0400 (Sat, 14 Apr 2007)
New Revision: 2856
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
Log:
Add support for invalid wsdl when creating a service
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-14 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -23,6 +23,8 @@
// $Id$
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Proxy;
import java.net.URL;
import java.util.ArrayList;
@@ -39,6 +41,7 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.Service.Mode;
@@ -70,6 +73,7 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
/**
* Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations.
@@ -101,11 +105,34 @@
public ServiceDelegateImpl(URL wsdlURL, QName serviceName, Class serviceClass)
{
+ UnifiedVirtualFile vfsRoot;
+
// If this Service was constructed through the ServiceObjectFactory
// this thread local association should be available
usRef = ServiceObjectFactory.getServiceRefAssociation();
+ if (usRef != null)
+ {
+ vfsRoot = usRef.getVfsRoot();
- UnifiedVirtualFile vfsRoot = (usRef != null ? usRef.getVfsRoot() : new ResourceLoaderAdapter());
+ // Verify wsdl access if this is not a generic Service
+ if (wsdlURL != null && serviceClass != Service.class)
+ {
+ try
+ {
+ InputStream is = wsdlURL.openStream();
+ is.close();
+ }
+ catch (IOException e)
+ {
+ log.warn("Cannot access wsdlURL: " + wsdlURL);
+ wsdlURL = null;
+ }
+ }
+ }
+ else
+ {
+ vfsRoot = new ResourceLoaderAdapter();
+ }
if (wsdlURL != null)
{
@@ -157,14 +184,37 @@
EndpointMetaData epMetaData = serviceMetaData.getEndpoint(portName);
if (epMetaData == null)
- throw new WebServiceException("Cannot get port meta data for: " + portName);
+ {
+ log.warn("Cannot get port meta data for: " + portName);
+ if (!seiClass.isAnnotationPresent(WebService.class))
+ throw new IllegalArgumentException("Cannot find @WebService on: " + seiClass.getName());
+
+ QName portType = getPortTypeName(seiClass);
+ epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, portType, Type.JAXWS);
+ }
+
String seiClassName = seiClass.getName();
epMetaData.setServiceEndpointInterfaceName(seiClassName);
return getPortInternal(epMetaData, seiClass);
}
+ private <T> QName getPortTypeName(Class<T> seiClass)
+ {
+ WebService anWebService = seiClass.getAnnotation(WebService.class);
+ String localPart = anWebService.name();
+ if (localPart.length() == 0)
+ localPart = WSDLUtils.getJustClassName(seiClass);
+
+ String nsURI = anWebService.targetNamespace();
+ if (nsURI.length() == 0)
+ nsURI = WSDLUtils.getTypeNamespace(seiClass);
+
+ QName portType = new QName(nsURI, localPart);
+ return portType;
+ }
+
@Override
/**
* The getPort method returns a stub. A service client uses this stub to invoke operations on the target service endpoint.
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 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -159,7 +159,10 @@
String wsContextRoot = applMetaData.getWebServiceContextRoot();
if (wsContextRoot != null)
contextRoot = wsContextRoot;
-
+
+ String ejbClass = beanMetaData.getEjbClass();
+ String ejbClassName = WSDLUtils.getJustClassName(ejbClass);
+
UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent();
if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null)
{
@@ -177,12 +180,11 @@
}
}
}
-
+
+ if (contextRoot == null)
+ contextRoot = ejbClassName + "Service";
if (urlPattern == null)
- {
- String ejbClass = beanMetaData.getEjbClass();
- urlPattern = ejbClass.substring(ejbClass.lastIndexOf(".") + 1);
- }
+ urlPattern = ejbClassName;
}
// If not, derive the context root from the deployment
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-04-14 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -71,7 +71,7 @@
if (wsdlURL == null)
throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL);
- if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceName + "]");
+ log.debug("START buildMetaData: [service=" + serviceName + "]");
try
{
UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot);
@@ -89,7 +89,7 @@
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel);
- if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData);
+ log.debug("END buildMetaData: " + wsMetaData);
return serviceMetaData;
}
catch (RuntimeException rte)
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 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -259,36 +259,36 @@
private EndpointResult processWebService(UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException, IOException
{
- WebService wsAnnotation = sepClass.getAnnotation(WebService.class);
- if (wsAnnotation == null)
+ WebService anWebService = sepClass.getAnnotation(WebService.class);
+ if (anWebService == null)
throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName());
Class<?> seiClass = null;
String seiName;
WSDLUtils wsdlUtils = WSDLUtils.getInstance();
- String name = wsAnnotation.name();
+ String name = anWebService.name();
if (name.length() == 0)
name = WSDLUtils.getJustClassName(sepClass);
- String serviceName = wsAnnotation.serviceName();
+ String serviceName = anWebService.serviceName();
if (serviceName.length() == 0)
serviceName = name + "Service";
- String serviceNS = wsAnnotation.targetNamespace();
+ String serviceNS = anWebService.targetNamespace();
if (serviceNS.length() == 0)
serviceNS = wsdlUtils.getTypeNamespace(sepClass);
- String portName = wsAnnotation.portName();
+ String portName = anWebService.portName();
if (portName.length() == 0)
portName = name + "Port";
- String wsdlLocation = wsAnnotation.wsdlLocation();
+ String wsdlLocation = anWebService.wsdlLocation();
String interfaceNS = serviceNS; // the default, but a SEI annotation may override this
- if (wsAnnotation.endpointInterface().length() > 0)
+ if (anWebService.endpointInterface().length() > 0)
{
- seiName = wsAnnotation.endpointInterface();
+ seiName = anWebService.endpointInterface();
seiClass = udi.classLoader.loadClass(seiName);
WebService seiAnnotation = seiClass.getAnnotation(WebService.class);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-04-14 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -701,11 +701,10 @@
public String getPackageName(String typeNS)
{
String pkgname = Util.xmlNamespaceToJavaPackage(typeNS);
- int len = pkgname.length();
return pkgname;
}
- public String getTypeNamespace(Class javaType)
+ public static String getTypeNamespace(Class javaType)
{
return getTypeNamespace(JavaUtils.getPackageName(javaType));
}
@@ -713,10 +712,8 @@
/**
* Extracts the typeNS given the package name
* Algorithm is based on the one specified in JAWS v2.0 spec
- * @param packageName
- * @return the type namespace
*/
- public String getTypeNamespace(String packageName)
+ public static String getTypeNamespace(String packageName)
{
StringBuilder sb = new StringBuilder("http://");
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-04-14 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -66,7 +66,7 @@
QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim");
Service service = factory.createService(wsdlURL, serviceName , mappingURL);
port = (RequestService)service.getPort(RequestService.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/SubmitRequestEJB");
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/RequestServiceEJBService/RequestServiceEJB");
}
}
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-04-14 20:31:08 UTC (rev 2855)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-04-14 22:37:18 UTC (rev 2856)
@@ -1,24 +1,24 @@
/*
- * 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.
- */
+ * 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.jbws944;
import javax.ejb.Remote;
@@ -29,15 +29,15 @@
import javax.jws.soap.SOAPBinding;
import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ws.annotation.WebContext;
@WebService(name = "EJB3Bean", targetNamespace = "http://org.jboss.ws/jbws944")
+@WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01")
@SOAPBinding(style = SOAPBinding.Style.RPC)
-
@Remote(EJB3RemoteInterface.class)
@RemoteHome(EJB3RemoteHome.class)
@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless(name = "FooBean01")
-
public class EJB3Bean01 implements EJB3RemoteInterface
{
@WebMethod
17 years, 1 month
- 1
- 0
JBossWS SVN: r2855 - in trunk: jbossws-tests and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 16:31:08 -0400 (Sat, 14 Apr 2007)
New Revision: 2855
Modified:
trunk/build/
trunk/jbossws-tests/build.xml
Log:
sync test build.xml with samples
Property changes on: trunk/build
___________________________________________________________________
Name: svn:ignore
-
output
thirdparty
ant.properties
version.properties.md5
+ output
thirdparty
ant.properties
version.properties.md5
clipboard.*
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-04-14 20:29:52 UTC (rev 2854)
+++ trunk/jbossws-tests/build.xml 2007-04-14 20:31:08 UTC (rev 2855)
@@ -373,7 +373,7 @@
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/jaxws/**/*"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
17 years, 1 month
- 1
- 0
JBossWS SVN: r2854 - trunk/jbossws-core/src/resources/samples.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 16:29:52 -0400 (Sat, 14 Apr 2007)
New Revision: 2854
Modified:
trunk/jbossws-core/src/resources/samples/build.xml
Log:
Add AOP classpath
Modified: trunk/jbossws-core/src/resources/samples/build.xml
===================================================================
--- trunk/jbossws-core/src/resources/samples/build.xml 2007-04-14 18:54:15 UTC (rev 2853)
+++ trunk/jbossws-core/src/resources/samples/build.xml 2007-04-14 20:29:52 UTC (rev 2854)
@@ -40,7 +40,7 @@
</condition>
<!-- Use -Ddebug=true for remote debugging -->
- <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
<isset property="debug"/>
</condition>
<condition property="remote.debug.line" value="">
@@ -48,10 +48,10 @@
<isset property="debug"/>
</not>
</condition>
-
+
<!-- Available integration target -->
<property name="integration.target.${jbossws.integration.target}" value="true"/>
-
+
<!-- Define jboss.home -->
<condition property="jboss.home" value="${jboss50.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
@@ -62,7 +62,7 @@
<condition property="jboss.home" value="${jboss40.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
-
+
<!-- Integration Target Server -->
<condition property="jbossws.integration.target.jboss">
<isset property="jboss.home"/>
@@ -70,13 +70,13 @@
<condition property="jbossws.integration.target.tomcat">
<equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
</condition>
-
+
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
-
+
<!-- Java Endorsed -->
<condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
<isset property="jbossws.integration.target.jboss"/>
@@ -84,7 +84,7 @@
<condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed">
<isset property="jbossws.integration.target.tomcat"/>
</condition>
-
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -101,26 +101,26 @@
<os family="windows"/>
</not>
</condition>
-
+
<!-- node0 defaults -->
<property name="node0" value="localhost"/>
<property name="node0.http.url" value="http://${node0}:8080"/>
<property name="node0.jndi.url" value="jnp://${node0}:1099"/>
<property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<mkdir dir="${tests.output.dir}/log"/>
<touch file="${tests.output.dir}/log/test.log"/>
-
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
<!-- Define excluded tests -->
<condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
<or>
@@ -130,7 +130,7 @@
</condition>
<property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
<property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
-
+
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -139,14 +139,14 @@
<echo message="endorsed = ${endorsed.dirs}"/>
<echo message="excludesfile = ${excludes-short-name}"/>
<echo message="-----------------------------------------------"/>
-
+
</target>
-
+
<!--
Init the various classpaths
-->
<target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
-
+
<target name="common-classpath" depends="prepare,thirdparty">
<path id="jbossws.classpath">
@@ -177,9 +177,9 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
</path>
</target>
-
+
<target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
-
+
<!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.classpath"/>
@@ -191,25 +191,25 @@
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>
-
+
<!-- The jBPM BPEL classpath -->
<path id="jbpm.bpel.classpath">
<path refid="jbossws.classpath"/>
<pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar"/>
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar"/>
- <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar"/>
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
<pathelement location="${thirdparty.dir}/commons-collections.jar"/>
<pathelement location="${thirdparty.dir}/commons-logging.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
@@ -222,22 +222,22 @@
-->
</path>
</target>
-
+
<target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
<fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
<path id="test.client.classpath">
<path refid="jbossws.classpath"/>
- <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
-
+
<!-- ================================================================== -->
<!-- Generating sources -->
<!-- ================================================================== -->
-
+
<target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5">
-
+
<!-- Define the JAX-WS wsconsume task -->
<taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
<classpath refid="core.classpath"/>
@@ -248,7 +248,7 @@
<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
</target>
-
+
<!--
Generate BPEL sources
-->
@@ -269,7 +269,7 @@
outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
</target>
-
+
<!--
Generate JAX-RPC sources
-->
@@ -303,7 +303,7 @@
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
@@ -352,9 +352,9 @@
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
-
+
<target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/>
-
+
<target name="compile14" depends="init" unless="HAVE_JDK_1.5">
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
@@ -428,24 +428,28 @@
<target name="tests" depends="main" description="Run all unit tests and generate a report">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
+ <param name="haltonfailure" value="false"/>
</antcall>
<antcall target="tests-report"/>
</target>
<!--
- Run a collection of unit tests.
- ant -Dtest=tools test
+ Run a collection of unit tests.
+ ant -Dtest=tools test
-->
<target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
+ <param name="haltonfailure" value="false"/>
</antcall>
</target>
<!-- Common test target -->
<target name="tests-main" depends="init">
<mkdir dir="${tests.output.dir}/reports"/>
- <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}">
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
<sysproperty key="client.scenario" value="${client.scenario}"/>
@@ -472,14 +476,14 @@
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${tests.output.dir}/reports" fork="true">
- <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
</batchtest>
</junit>
</target>
<!--
- Run a single unit test.
- ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
<mkdir dir="${tests.output.dir}/reports"/>
17 years, 1 month
- 1
- 0
JBossWS SVN: r2853 - in trunk/build/hudson/hudson-home/jobs: JBWS-Samples-AS-4.0.5 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 14:54:15 -0400 (Sat, 14 Apr 2007)
New Revision: 2853
Modified:
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
Log:
Fix test results location
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-04-14 18:14:35 UTC (rev 2852)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-04-14 18:54:15 UTC (rev 2853)
@@ -57,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-04-14 18:14:35 UTC (rev 2852)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-04-14 18:54:15 UTC (rev 2853)
@@ -57,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-04-14 18:14:35 UTC (rev 2852)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-04-14 18:54:15 UTC (rev 2853)
@@ -57,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-04-14 18:14:35 UTC (rev 2852)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-04-14 18:54:15 UTC (rev 2853)
@@ -57,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-04-14 18:14:35 UTC (rev 2852)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-04-14 18:54:15 UTC (rev 2853)
@@ -55,7 +55,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
17 years, 1 month
- 1
- 0
JBossWS SVN: r2852 - branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-14 14:14:35 -0400 (Sat, 14 Apr 2007)
New Revision: 2852
Modified:
branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java
Log:
Remove AltDD behaviour as no longer required.
Modified: branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java
===================================================================
--- branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 17:48:18 UTC (rev 2851)
+++ branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 18:14:35 UTC (rev 2852)
@@ -61,15 +61,10 @@
// Call the super implementation
super.deployServiceEndpoint(unit);
- // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
- InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream();
- RewriteResults results = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader());
-
- URL webXML = results.webXML;
- modifyWebMetaData(unit, webXML);
+ modifyWebMetaData(unit);
}
- private void modifyWebMetaData(DeploymentUnit unit, URL webXML) throws Exception
+ private void modifyWebMetaData(DeploymentUnit unit) throws Exception
{
Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class);
if (allMetaData.size() < 1)
@@ -98,9 +93,6 @@
}
- // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
- String webXmlPath = webXML.getPath();
- webMetaData.setAltDDPath(webXmlPath);
}
private boolean isAServlet(String servletClassName, ClassLoader cl)
17 years, 1 month
- 1
- 0
JBossWS SVN: r2851 - in trunk: build/eclipse and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)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(a)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=(a)jboss50.home@
+jboss42.home=(a)jboss42.home@
+jboss40.home=(a)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=(a)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")
-@WebContext(contextRoot = "EJB3Bean01", authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false)
+@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
17 years, 1 month
- 1
- 0
JBossWS SVN: r2850 - branches/JBWS-515/jbossws-core/src/java/org/jboss/ws/annotation.
by jbossws-commits＠lists.jboss.org
Author: maeste
Date: 2007-04-14 13:46:29 -0400 (Sat, 14 Apr 2007)
New Revision: 2850
Added:
branches/JBWS-515/jbossws-core/src/java/org/jboss/ws/annotation/RMAssertion.java
Log:
Annotation for WSRM-Policy
Added: branches/JBWS-515/jbossws-core/src/java/org/jboss/ws/annotation/RMAssertion.java
===================================================================
--- branches/JBWS-515/jbossws-core/src/java/org/jboss/ws/annotation/RMAssertion.java (rev 0)
+++ branches/JBWS-515/jbossws-core/src/java/org/jboss/ws/annotation/RMAssertion.java 2007-04-14 17:46:29 UTC (rev 2850)
@@ -0,0 +1,41 @@
+package org.jboss.ws.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.METHOD })
+public @interface RMAssertion {
+
+ /**
+ * A parameter that specifies a period of inactivity for a Sequence.
+ * If omitted, there is no implied value.
+ * The inactivity timeout duration, specified in milliseconds.
+ */
+ long inactivityTimeout();
+
+ /**
+ * A parameter that specifies how long the RM Source will wait after transmitting
+ * a message and before retransmitting the message.
+ * If omitted, there is no implied value.
+ * Specified in milliseconds.
+ */
+ long baseRetransmissionInterval();
+
+ /**
+ * A parameter that specifies that the retransmission interval
+ * will be adjusted using the exponential backoff algorithm [Tanenbaum].
+ * If omitted, there is no implied value.
+ */
+ boolean exponentialBackoff() default false;
+ /**
+ * A parameter that specifies the duration after which the RM Destination will transmit an acknowledgement.
+ * If omitted, there is no implied value
+ * Specified in milliseconds.
+ */
+ long acknowledgementInterval();
+
+}
17 years, 1 month
- 1
- 0
JBossWS SVN: r2849 - trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 13:01:23 -0400 (Sat, 14 Apr 2007)
New Revision: 2849
Modified:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
Log:
Specifiy contextRoot
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 16:57:30 UTC (rev 2848)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-04-14 17:01:23 UTC (rev 2849)
@@ -52,7 +52,7 @@
// jboss propriatary annotations
@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01")
-@WebContext(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false)
+@WebContext(contextRoot = "EJB3Bean01", authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false)
@SecurityDomain("JBossWS")
public class EJB3Bean01 implements EJB3RemoteInterface
{
17 years, 1 month
- 1
- 0
JBossWS SVN: r2848 - in branches/dlofthouse/JBWS-1093: jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-14 12:57:30 -0400 (Sat, 14 Apr 2007)
New Revision: 2848
Modified:
branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java
branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
Log:
Fix test case for JBoss 5.0.x
Modified: branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java
===================================================================
--- branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 16:56:23 UTC (rev 2847)
+++ branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 16:57:30 UTC (rev 2848)
@@ -35,6 +35,7 @@
import org.jboss.metadata.web.Servlet;
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults;
+import org.jboss.ws.core.utils.JavaUtils;
/**
* An abstract deployer for JSE Endpoints
@@ -63,7 +64,7 @@
// FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream();
RewriteResults results = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader());
-
+
URL webXML = results.webXML;
modifyWebMetaData(unit, webXML);
}
@@ -88,12 +89,13 @@
continue;
// Nothing to do if we have an <init-param>
- if (isAlreadyModified(servlet) == false)
+ if (isAlreadyModified(servlet) == false && isAServlet(servletClassName, unit.getClassLoader()) == false)
{
servlet.setServletClass(serviceEndpointServlet);
NameValuePair initParam = new NameValuePair(AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName);
servlet.addInitParam(initParam);
}
+
}
// FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
@@ -101,6 +103,33 @@
webMetaData.setAltDDPath(webXmlPath);
}
+ private boolean isAServlet(String servletClassName, ClassLoader cl)
+ {
+ boolean isAServlet = false;
+
+ if (cl != null)
+ {
+ try
+ {
+ Class servletClass = cl.loadClass(servletClassName);
+
+ isAServlet = JavaUtils.isAssignableFrom(javax.servlet.Servlet.class, servletClass);
+
+ if (isAServlet == true)
+ {
+ log.info("Ignore servlet: " + servletClassName);
+ }
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ }
+
+ }
+
+ return isAServlet;
+ }
+
private boolean isAlreadyModified(Servlet servlet)
{
Iterator itParams = servlet.getInitParams().iterator();
Modified: branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-04-14 16:56:23 UTC (rev 2847)
+++ branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-04-14 16:57:30 UTC (rev 2848)
@@ -85,12 +85,6 @@
public void testAccessServlet() throws Exception
{
- if (true)
- {
- System.out.println("FIXME: [JBAS-4210] HTTP request dispatched to the wrong servlet");
- return;
- }
-
URL servletURL = new URL("http://" + getServerHost() + ":8080" + "/jaxrpc-jbws1093/ServletTest");
InputStream is = servletURL.openStream();
17 years, 1 month
- 1
- 0