JBossWS SVN: r3207 - in branches/jbossws-2.0/jbossws-tests: src/java/org/jboss/test/ws/jaxws/samples/swaref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-23 06:50:19 -0400 (Wed, 23 May 2007)
New Revision: 3207
Added:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
Removed:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpointImpl.java
Modified:
branches/jbossws-2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
Log:
Split swaref samples into bare and wrapped tests
Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-samples-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-23 10:49:42 UTC (rev 3206)
+++ branches/jbossws-2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-23 10:50:19 UTC (rev 3207)
@@ -179,7 +179,8 @@
<!-- jaxws-samples-swaref -->
<jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar">
<fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/swaref/Doc*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/swaref/*Test*.class"/>
</fileset>
</jar>
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java (from rev 3194, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpoint.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -0,0 +1,18 @@
+package org.jboss.test.ws.jaxws.samples.swaref;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+import javax.jws.soap.SOAPBinding;
+import javax.ejb.Remote;
+
+@WebService(name="BareEndpoint")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@Remote
+public interface BareEndpoint
+{
+ @WebMethod
+ void submitAttachment(DocumentPayload payload);
+
+ @WebMethod
+ DocumentPayload retrieveAttachment();
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java (from rev 3194, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpointImpl.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -0,0 +1,33 @@
+package org.jboss.test.ws.jaxws.samples.swaref;
+
+import org.jboss.ws.annotation.WebContext;
+
+import javax.jws.WebService;
+import javax.ejb.Stateless;
+import javax.activation.DataHandler;
+import java.io.IOException;
+
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.swaref.BareEndpoint")
+@WebContext(contextRoot = "jaxws-swaref")
+public class BareEndpointImpl implements BareEndpoint
+{
+
+ public void submitAttachment(DocumentPayload payload)
+ {
+ try
+ {
+ System.out.println("Got '" + payload.getData().getContent() +"'");
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public DocumentPayload retrieveAttachment()
+ {
+ DataHandler data = new DataHandler("Server data", "text/plain");
+ return new DocumentPayload(data);
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpoint.java 2007-05-23 10:49:42 UTC (rev 3206)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpoint.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -1,18 +0,0 @@
-package org.jboss.test.ws.jaxws.samples.swaref;
-
-import javax.jws.WebService;
-import javax.jws.WebMethod;
-import javax.jws.soap.SOAPBinding;
-import javax.ejb.Remote;
-
-@WebService(name="DocLitEndpoint")
-@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@Remote
-public interface DocLitEndpoint
-{
- @WebMethod
- void submitAttachment(DocumentPayload payload);
-
- @WebMethod
- DocumentPayload retrieveAttachment();
-}
Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpointImpl.java 2007-05-23 10:49:42 UTC (rev 3206)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocLitEndpointImpl.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -1,22 +0,0 @@
-package org.jboss.test.ws.jaxws.samples.swaref;
-
-import javax.jws.WebService;
-import javax.ejb.Stateless;
-import javax.activation.DataHandler;
-
-@Stateless
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.swaref.DocLitEndpoint")
-public class DocLitEndpointImpl implements DocLitEndpoint
-{
-
- public void submitAttachment(DocumentPayload payload)
- {
- System.out.println("Retrieved " + payload.getData().getContentType());
- }
-
- public DocumentPayload retrieveAttachment()
- {
- DataHandler data = new DataHandler("Plain text attachment", "text/plain");
- return new DocumentPayload(data);
- }
-}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-23 10:49:42 UTC (rev 3206)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -16,35 +16,48 @@
*/
public class SWARefTestCase extends JBossWSTest
{
- private String endpointURL = "http://" + getServerHost() + ":9090/DocLitEndpointImplService/DocLitEndpointImpl";
+ private String bareEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/BareEndpointImpl";
+ private String wrappedEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/WrappedEndpointImpl";
+ private QName bareServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "BareEndpointImplService");
+ private QName wrappedServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "WrappedEndpointImplService");
+
+ private static DataHandler data = new DataHandler("Client data", "text/plain");
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar");
}
- public void testSubmitAttachment() throws Exception {
- DataHandler data = new DataHandler("Client data", "text/plain");
+ public void testSubmitAttachment() throws Exception
+ {
+ Service service = Service.create(new URL(bareEndpointURL +"?wsdl"), bareServiceQName);
+ BareEndpoint port = service.getPort(BareEndpoint.class);
+ port.submitAttachment(new DocumentPayload(data));
+ }
- System.out.println(endpointURL);
-
- Service service = Service.create(new URL(endpointURL+"?wsdl"), new QName("http://swaref.samples.jaxws.ws.test.jboss.org/","DocLitEndpointImplService"));
- DocLitEndpoint port = service.getPort(DocLitEndpoint.class);
+ public void testRetrieveAttachment() throws Exception {
+ Service service = Service.create(new URL(bareEndpointURL +"?wsdl"), bareServiceQName);
+ BareEndpoint port = service.getPort(BareEndpoint.class);
+ DocumentPayload response = port.retrieveAttachment();
+ assertTrue(response.getData().getContent().equals("Server data"));
+ }
+ public void testWrappedEndpoint() throws Exception
+ {
+ Service service = Service.create(new URL(wrappedEndpointURL+"?wsdl"), wrappedServiceQName);
+ WrappedEndpoint port = service.getPort(WrappedEndpoint.class);
+
// tweak endpoint URL
BindingProvider provider = (BindingProvider)port;
provider.getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURL
+ wrappedEndpointURL
);
- // disable chunked encoding
- ((StubExt)port).setConfigName("HTTP 1.0 Client");
+ DocumentPayload response = port.myTest(new DocumentPayload(data), "Hello world");
+ assertTrue(response.getData().getContent().equals("Server data"));
- port.submitAttachment(new DocumentPayload(data));
}
- public void testRetrieveAttachment() throws Exception {
- // TODO: implement
- }
}
Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -0,0 +1,19 @@
+package org.jboss.test.ws.jaxws.samples.swaref;
+
+import org.jboss.ws.annotation.WebContext;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.ejb.Remote;
+import java.rmi.RemoteException;
+
+@Remote
+@WebService
+public interface WrappedEndpoint
+{
+ /* (non-Javadoc)
+ * @see org.jboss.ws.test.TestService#myTest(javax.activation.DataHandler)
+ */
+ @WebMethod
+ DocumentPayload myTest(DocumentPayload dhw, String test) throws RemoteException;
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-23 10:50:19 UTC (rev 3207)
@@ -0,0 +1,89 @@
+package org.jboss.test.ws.jaxws.samples.swaref;
+
+import org.jboss.ws.annotation.WebContext;
+
+import javax.activation.DataHandler;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.ejb.Stateless;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.rmi.RemoteException;
+
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.swaref.WrappedEndpoint")
+@WebContext(contextRoot = "jaxws-swaref")
+public class WrappedEndpointImpl implements WrappedEndpoint
+{
+ /* (non-Javadoc)
+ * @see org.jboss.ws.test.TestService#myTest(javax.activation.DataHandler)
+ */
+ @WebMethod
+ public DocumentPayload myTest(DocumentPayload dhw, String test) throws RemoteException
+ {
+ DataHandler dh;
+
+ try {
+ System.out.println("[TestServiceImpl] ---> Dans le service");
+
+ // récupère la pièce attachée
+ if (dhw != null && dhw.getData() != null) {
+ dh=dhw.getData();
+ dumpDH(dh);
+ }
+ else
+ {
+ System.out.println("[TestServiceImpl] ---> Le DataHandler est NULL.");
+ }
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ dh = new DataHandler("Server data", "text/plain") ;
+
+ try{
+ System.out.println("[TestServiceImpl] ---> Le DataHandler returned.");
+ dumpDH(dh);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ return new DocumentPayload(dh);
+ }
+
+
+
+
+ private static void dumpDH(DataHandler in_dh) throws Exception
+ {
+ InputStream is = in_dh.getInputStream();
+ if (is != null) {
+
+ System.out.println("[TestServiceImpl] ---> in_dh START : ");
+ System.out.println("[TestServiceImpl] ---> in_dh START : ");
+ System.out.println("[TestServiceImpl] ---> in_dh START : ");
+
+ // récupère le contenu du fichier
+ BufferedReader in = new BufferedReader(new InputStreamReader(is));
+ String ligne="";
+ ligne = in.readLine();
+ while (ligne != null)
+ {
+ System.out.println(ligne);
+ ligne = in.readLine();
+ }
+ in.close();
+ System.out.println("[TestServiceImpl] ---> END.");
+ System.out.println("[TestServiceImpl] ---> END.");
+ System.out.println("[TestServiceImpl] ---> END.");
+ }
+ else
+ {
+ System.out.println("[TestServiceImpl] ---> in_dh inputstream is null.");
+ }
+
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 11 months
- 1
- 0
JBossWS SVN: r3206 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-23 06:49:42 -0400 (Wed, 23 May 2007)
New Revision: 3206
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
Log:
Fix JBWS-1658
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-23 09:46:06 UTC (rev 3205)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-23 10:49:42 UTC (rev 3206)
@@ -151,7 +151,7 @@
private static boolean isJDKType(Class clazz)
{
- return clazz.getPackage()!= null ? clazz.getPackage().getName().startsWith("java") : true;
+ return clazz.getCanonicalName().startsWith("java") || clazz.isPrimitive();
}
private static AttachmentScanResult scanGetterAnnotation(Class owner, Field field)
18 years, 11 months
- 1
- 0
JBossWS SVN: r3205 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 05:46:06 -0400 (Wed, 23 May 2007)
New Revision: 3205
Removed:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
trunk/integration/jbws/ant-import/build-testsuite.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml
Log:
Fix core jboss42 issues
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -110,6 +110,7 @@
<pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.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"/>
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -70,11 +70,7 @@
{
super.create(ep);
- ObjectName epName = ep.getName();
- String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (ejbName == null)
- throw new WebServiceException("Cannot obtain ejb-link from port component");
-
+ String ejbName = ep.getShortName();
UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData;
UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -58,10 +58,7 @@
{
super.create(ep);
- String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (ejbName == null)
- throw new WebServiceException("Cannot obtain ejb-link");
-
+ String ejbName = ep.getShortName();
UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName;
if (udi.parent != null)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -59,7 +59,7 @@
{
if (ep.getTargetBean() == null)
{
- String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ String servletName = ep.getShortName();
String beanClassName = results.sepTargetMap.get(servletName);
if (beanClassName == null)
throw new IllegalStateException("Cannot obtain target bean for: " + servletName);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -72,11 +72,7 @@
{
super.create(ep);
- ObjectName epName = ep.getName();
- String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (ejbName == null)
- throw new WebServiceException("Cannot obtain ejb-link from port component");
-
+ String ejbName = ep.getShortName();
UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData;
UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -56,10 +56,7 @@
public void create(Endpoint ep)
{
- String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (ejbName == null)
- throw new WebServiceException("Cannot obtain ejb-link");
-
+ String ejbName = ep.getShortName();
UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName;
if (udi.parent != null)
Modified: trunk/integration/jbws/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -43,7 +43,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
<macro-compile-classes srcdir="${tests.java.dir}"/>
</target>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -55,16 +55,11 @@
{
super.init(servletConfig);
epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ endpoint = initServiceEndpoint(getServletContext().getContextPath());
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -79,11 +74,12 @@
/** Initialize the service endpoint
*/
- protected void initServiceEndpoint(String contextPath)
+ protected Endpoint initServiceEndpoint(String contextPath)
{
if (contextPath.startsWith("/"))
contextPath = contextPath.substring(1);
+ Endpoint endpoint = null;
String servletName = getServletName();
for (ObjectName sepId : epRegistry.getEndpoints())
{
@@ -102,5 +98,7 @@
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
+
+ return endpoint;
}
}
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -53,7 +53,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
<macro-compile-classes srcdir="${tests.java.dir}"/>
</target>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -73,7 +73,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
<macro-compile-classes srcdir="${tests.java.dir}"/>
</target>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -25,7 +25,7 @@
<!--
Init the various classpaths
-->
- <target name="tests-init" depends="jars,tests-prepare">
+ <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
@@ -48,18 +48,18 @@
<!-- The jBPM BPEL classpath -->
<path id="jbpm.bpel.classpath">
<path refid="ws.stack.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}/commons-collections.jar"/>
- <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
- <pathelement location="${thirdparty.dir}/dom4j.jar"/>
- <pathelement location="${thirdparty.dir}/jaxen.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
+ <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
+ <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
+ <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
+ <pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
<!--
- <pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/log4j.jar"/>
<pathelement location="${tests.etc.dir}"/>
-->
</path>
@@ -75,8 +75,8 @@
<!-- Define the JAX-WS wsconsume task -->
<taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
<classpath refid="ws.stack.classpath"/>
- <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
- <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
+ <classpath location="${core.dir}/thirdparty/jbossws-wsconsume-impl.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
</taskdef>
<wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
@@ -98,7 +98,7 @@
<fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
<!-- Copy the BPEL sar -->
- <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
+ <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
<!-- generate wsdl binding and service definitions for bpel processes -->
<taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
@@ -118,9 +118,7 @@
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="ws.stack.classpath"/>
<classpath refid="thirdparty.classpath"/>
- <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
- <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
- <classpath location="${thirdparty.dir}/concurrent.jar"/>
+ <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
</taskdef>
@@ -173,7 +171,7 @@
<taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide">
<classpath refid="ws.stack.classpath"/>
<classpath refid="thirdparty.classpath"/>
- <classpath location="${thirdparty.dir}/concurrent.jar"/>
+ <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
</taskdef>
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.server;
-
-// $Id$
-
-import java.io.IOException;
-
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.ws.WSException;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
-
-/**
- * A servlet that is installed for every web service endpoint.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public abstract class AbstractServiceEndpointServlet extends HttpServlet
-{
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- public void init(ServletConfig config) throws ServletException
- {
- super.init(config);
- epRegistry = EndpointRegistryFactory.getEndpointRegistry();
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
- RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
-
- /** Initialize the service endpoint
- */
- protected void initServiceEndpoint(String contextPath)
- {
- String servletName = getServletName();
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
-
- for (ObjectName sepId : epRegistry.getEndpoints())
- {
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = epRegistry.getEndpoint(sepId);
- break;
- }
- }
-
- if (endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + ","
- + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
- throw new WSException("Cannot obtain endpoint for: " + oname);
- }
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -26,8 +26,9 @@
import javax.servlet.ServletContext;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.server.AbstractServiceEndpointServlet;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointServlet;
/**
* A servlet that is installed for every web service endpoint.
@@ -35,16 +36,17 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class ServiceEndpointServlet extends AbstractServiceEndpointServlet
+public class ServiceEndpointServlet extends EndpointServlet
{
// provide logging
private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class);
/** Initialize the service endpoint
*/
- protected void initServiceEndpoint(String contextPath)
+ @Override
+ protected Endpoint initServiceEndpoint(String contextPath)
{
- super.initServiceEndpoint(contextPath);
+ Endpoint endpoint = super.initServiceEndpoint(contextPath);
// read the config name/file from web.xml
ServletContext ctx = getServletContext();
@@ -59,5 +61,7 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
epMetaData.setConfigName(configName, configFile);
}
+
+ return endpoint;
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -90,7 +90,7 @@
// Nothing to do if we have an <init-param>
if (isAlreadyModified(servlet))
{
- for (Iterator itParam = servlet.elementIterator("init-param"); it.hasNext();)
+ for (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();)
{
Element elParam = (Element)itParam.next();
String paramName = elParam.element("param-name").getTextTrim();
@@ -121,7 +121,7 @@
if (orgServletClassName.equals(servletClass) == false)
{
targetBeanName = orgServletClassName;
- Element paramElement = classElement.addElement("init-param");
+ Element paramElement = servlet.addElement("init-param");
paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT);
paramElement.addElement("param-value").addText(targetBeanName);
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-23 09:46:06 UTC (rev 3205)
@@ -110,7 +110,7 @@
try
{
ServiceFactory serviceFactory = ServiceFactory.newInstance();
- Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloSLSB?wsdl"), SERVICE_NAME);
+ Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloEJB?wsdl"), SERVICE_NAME);
Call call = (Call)service.createCall(new QName(NAMESPACE, "HelloPort"), "sayHello");
String retstr = (String)call.invoke(new Object[] { "Hello" });
assertEquals("'Hello' to you too!", retstr);
@@ -139,7 +139,7 @@
try
{
- URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897-fail/HelloSLSB");
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897-fail/ShoulBeHello");
url.openStream();
fail("Deployment was expected to fail");
}
Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -8,7 +8,7 @@
<!-- Test that we can deploy an already modified web.xml -->
<servlet>
<servlet-name>Hello</servlet-name>
- <servlet-class>org.jboss.ws.core.server.ServiceEndpointServlet</servlet-class>
+ <servlet-class>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value>
Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-05-23 09:37:57 UTC (rev 3204)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-05-23 09:46:06 UTC (rev 3205)
@@ -9,22 +9,22 @@
<service-ref>
<service-ref-name>service/HelloNone</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/HelloEJBService/HelloEJB?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl</wsdl-override>
</service-ref>
<service-ref>
<service-ref-name>service/HelloPCOne</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Path/HelloPCOne?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl</wsdl-override>
</service-ref>
<service-ref>
<service-ref-name>service/HelloPCTwo</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Path/HelloPCTwo?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl</wsdl-override>
</service-ref>
<service-ref>
<service-ref-name>service/HelloContextRoot</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloEJB?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloContextRoot?wsdl</wsdl-override>
</service-ref>
<service-ref>
18 years, 11 months
- 1
- 0
JBossWS SVN: r3204 - in branches/jbossws-2.0/jbossws-tests/src/resources: benchmark/jaxrpc/rpclit/META-INF and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 05:37:57 -0400 (Wed, 23 May 2007)
New Revision: 3204
Modified:
branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml
branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml
branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml
branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml
branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
Log:
Use explicit context-root
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -3,12 +3,17 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+
+ <webservices>
+ <context-root>/jaxrpc-benchmark-doc-ejb</context-root>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>BenchmarkDocLit</ejb-name>
<port-component>
<port-component-name>BenchmarkDocLitEJBWS</port-component-name>
- <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri>
+ <port-component-uri>/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -3,12 +3,17 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+
+ <webservices>
+ <context-root>/jaxrpc-benchmark-rpc-ejb</context-root>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>BenchmarkRpcLit</ejb-name>
<port-component>
<port-component-name>BenchmarkRpcLitEJBWS</port-component-name>
- <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri>
+ <port-component-uri>/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -6,13 +6,17 @@
<security-domain>java:/jaas/JBossWS</security-domain>
+ <webservices>
+ <context-root>/jaxrpc-jbws723</context-root>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>RoleSecuredSLSB</ejb-name>
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri>
+ <port-component-uri>/RoleSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
<!-- default secure-wsdl-access (false for jaxrpc) -->
@@ -23,7 +27,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri>
+ <port-component-uri>/BasicSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
<secure-wsdl-access>true</secure-wsdl-access>
@@ -34,7 +38,7 @@
<jndi-name>ejb/ConfidentialSLSB</jndi-name>
<port-component>
<port-component-name>ConfidentialSecured</port-component-name>
- <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri>
+ <port-component-uri>/ConfidentialSecured</port-component-uri>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
<secure-wsdl-access>false</secure-wsdl-access>
</port-component>
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -3,12 +3,16 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+ <webservices>
+ <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>TestService</ejb-name>
<port-component>
<port-component-name>TestServicePort</port-component-name>
- <port-component-uri>/jaxrpc-samples-jsr109ejb-doc/*</port-component-uri>
+ <port-component-uri>/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -5,6 +5,7 @@
<jboss>
<webservices>
+ <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
<webservice-description>
<webservice-description-name>TestService</webservice-description-name>
<wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
@@ -16,7 +17,7 @@
<ejb-name>TestService</ejb-name>
<port-component>
<port-component-name>TestServicePort</port-component-name>
- <port-component-uri>/jaxrpc-samples-jsr109ejb-rpc/*</port-component-uri>
+ <port-component-uri>/*</port-component-uri>
</port-component>
</session>
</enterprise-beans>
Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-05-23 08:12:39 UTC (rev 3203)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-05-23 09:37:57 UTC (rev 3204)
@@ -6,13 +6,17 @@
<security-domain>java:/jaas/JBossWS</security-domain>
+ <webservices>
+ <context-root>/jaxrpc-samples-ejb</context-root>
+ </webservices>
+
<enterprise-beans>
<session>
<ejb-name>RoleSecuredSLSB</ejb-name>
<jndi-name>ejb/RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
- <port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri>
+ <port-component-uri>/RoleSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
</port-component>
@@ -22,7 +26,7 @@
<jndi-name>ejb/BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
- <port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri>
+ <port-component-uri>/BasicSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
</port-component>
@@ -32,7 +36,7 @@
<jndi-name>ejb/ConfidentialSLSB</jndi-name>
<port-component>
<port-component-name>ConfidentialSecured</port-component-name>
- <port-component-uri>/jaxrpc-samples-ejb/ConfidentialSecured</port-component-uri>
+ <port-component-uri>/ConfidentialSecured</port-component-uri>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</port-component>
</session>
18 years, 11 months
- 1
- 0
JBossWS SVN: r3203 - in trunk: jbossws-core and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 04:12:39 -0400 (Wed, 23 May 2007)
New Revision: 3203
Modified:
trunk/build/version.properties
trunk/jbossws-core/version.properties
Log:
Move wstx version to build/version.properties
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-23 07:28:11 UTC (rev 3202)
+++ trunk/build/version.properties 2007-05-23 08:12:39 UTC (rev 3203)
@@ -27,3 +27,4 @@
sun-jaxrpc=1.1
sun-jaxws=2.1.1
sun-servlet=2.5
+woodstox=3.1.1
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-23 07:28:11 UTC (rev 3202)
+++ trunk/jbossws-core/version.properties 2007-05-23 08:12:39 UTC (rev 3203)
@@ -33,6 +33,5 @@
sun-hudson=1.93
sun-jaf=1.1
sun-javamail=1.4
-woodstox=3.1.1
wscommons-policy=1.0
xmlunit=1.0
18 years, 11 months
- 1
- 0
JBossWS SVN: r3202 - in trunk: build/hudson/hudson-home/jobs/AS-Tests-AS-5.0 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 03:28:11 -0400 (Wed, 23 May 2007)
New Revision: 3202
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Include wstx in SunRI classpath
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT clean deploy-jboss42
+ant $ENVIRONMENT clobber deploy-jboss42
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clobber deploy-jboss50
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT clean deploy-jboss42
+ant $ENVIRONMENT clobber deploy-jboss42
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clobber deploy-jboss50
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# Build jbws-jboss42
#
cd $JBWSDIR/integration/jbws
-ant $ENVIRONMENT clean deploy-jboss42
+ant $ENVIRONMENT clobber deploy-jboss42
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# Build deploy-jboss50
#
cd $JBWSDIR/integration/jbws
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clobber deploy-jboss50
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# Build sunri-jboss50
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clobber deploy-jboss50
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -28,7 +28,7 @@
# Build xfire
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT clean deploy-jboss50
+ant $ENVIRONMENT clobber deploy-jboss50
#
# start jbossas
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -40,6 +40,9 @@
<fileset dir="${spi.dir}/output/lib">
<include name="jbossws-spi.jar"/>
</fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
</copy>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"/>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -24,7 +24,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="jars,tests-classpath">
+ <target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
@@ -41,6 +41,7 @@
<pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
</path>
<path id="tests.extra.classpath">
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -62,6 +62,7 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -40,6 +40,9 @@
<fileset dir="${spi.dir}/output/lib">
<include name="jbossws-spi.jar"/>
</fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
</copy>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 07:28:11 UTC (rev 3202)
@@ -24,7 +24,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="jars,tests-classpath">
+ <target name="tests-init" depends="tests-classpath">
<!--
Cannot use XFire client
@@ -47,6 +47,7 @@
<pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
</path>
<path id="xfire.classpath">
18 years, 11 months
- 1
- 0
JBossWS SVN: r3201 - in trunk/integration: xfire/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 03:03:48 -0400 (Wed, 23 May 2007)
New Revision: 3201
Modified:
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix classpath dependencies
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 06:57:42 UTC (rev 3200)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201)
@@ -24,7 +24,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="jars,tests-prepare">
+ <target name="tests-init" depends="jars,tests-classpath">
<path id="ws.stack.classpath">
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 06:57:42 UTC (rev 3200)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 07:03:48 UTC (rev 3201)
@@ -24,7 +24,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="jars,tests-prepare">
+ <target name="tests-init" depends="jars,tests-classpath">
<!--
Cannot use XFire client
18 years, 11 months
- 1
- 0
JBossWS SVN: r3200 - in trunk: integration/jbws/ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 02:57:42 -0400 (Wed, 23 May 2007)
New Revision: 3200
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/integration/jbws/ant-import/build-testsuite.xml
trunk/testsuite/ant-import/build-testsuite.xml
Log:
Fix classpath dependencies
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
+++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 06:57:42 UTC (rev 3200)
@@ -87,7 +87,7 @@
<target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/>
- <target name="tests-classpath-jboss50" depends="tests-init" if="jbossws.integration.jboss50">
+ <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
@@ -107,7 +107,6 @@
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
@@ -118,7 +117,7 @@
</path>
</target>
- <target name="tests-classpath-jboss42" depends="tests-init" if="jbossws.integration.jboss42">
+ <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
Modified: trunk/integration/jbws/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
+++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 06:57:42 UTC (rev 3200)
@@ -24,7 +24,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="tests-prepare">
+ <target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
Modified: trunk/testsuite/ant-import/build-testsuite.xml
===================================================================
--- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
+++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 06:57:42 UTC (rev 3200)
@@ -17,7 +17,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-init" depends="tests-prepare"/>
+ <target name="tests-init" depends="tests-classpath"/>
<!-- ================================================================== -->
<!-- Building -->
18 years, 11 months
- 1
- 0
JBossWS SVN: r3199 - in trunk: integration/jbws/ant-import and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 01:45:07 -0400 (Wed, 23 May 2007)
New Revision: 3199
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/integration/jbws/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java
trunk/testsuite/ant-import/build-testsuite.xml
Log:
Unify test classpaths
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -85,11 +85,92 @@
</tstamp>
</target>
+ <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/>
+
+ <target name="tests-classpath-jboss50" depends="tests-init" if="jbossws.integration.jboss50">
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ </path>
+ <path id="tests.client.classpath">
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.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="tests.javac.classpath"/>
+ </path>
+ </target>
+
+ <target name="tests-classpath-jboss42" depends="tests-init" if="jbossws.integration.jboss42">
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ </path>
+ <path id="tests.client.classpath">
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.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="tests.javac.classpath"/>
+ </path>
+ </target>
+
<!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-compile-classes">
+ <attribute name="srcdir"/>
+ <sequential>
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <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="@{srcdir}"/>
+ <classpath refid="tests.javac.classpath"/>
+ </javac>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Building -->
<!-- ================================================================== -->
- <macrodef name="copy-test-resources">
+ <macrodef name="macro-copy-resources">
<attribute name="srcdir"/>
<sequential>
<copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/>
Modified: trunk/integration/jbws/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -20,73 +20,31 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="tests-init-jboss50,tests-init-jboss42">
- <path id="jbossws.classpath">
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-init" depends="tests-prepare">
+
+ <path id="ws.stack.classpath">
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
</path>
- </target>
-
- <target name="tests-init-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
- <path id="javac.classpath">
- <path refid="jbossws.classpath"/>
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+
+ <path id="tests.extra.classpath">
</path>
- <path id="tests.client.classpath">
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.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>
+
</target>
- <target name="tests-init-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42">
- <path id="javac.classpath">
- <path refid="jbossws.classpath"/>
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jboss-common-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
- <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/jbosssx-client.jar"/>
- </path>
- <path id="tests.client.classpath">
- <pathelement location="${jboss.client}/commons-logging.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.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>
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.java.dir}"/>
</target>
</project>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -23,53 +23,37 @@
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
+
+ <target name="tests-init" depends="jars,tests-prepare">
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="tests-prepare,thirdparty">
-
- <path id="sunri.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
</path>
-
- <!-- The combined compile classpath -->
- <path id="javac.classpath">
- <path refid="sunri.classpath"/>
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+
+ <path id="tests.extra.classpath">
</path>
-
- <!-- The test client classpath -->
- <path id="tests.client.classpath">
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/wstx.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <path refid="javac.classpath"/>
- </path>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+ <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.java.dir}"/>
+ </target>
+
</project>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -23,28 +23,15 @@
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
+
+ <target name="tests-init" depends="jars,tests-prepare">
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="tests-prepare,thirdparty">
-
<!--
Cannot use XFire client
[JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
-->
<ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
- <path id="jbossws.classpath">
- <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
- <pathelement location="${core.dir}/thirdparty/jboss-xml-binding.jar"/>
- <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
- </path>
-
<path id="sunri.classpath">
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
@@ -71,34 +58,22 @@
<pathelement location="${thirdparty.dir}/xfire-all.jar"/>
<pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
</path>
-
- <!-- The combined compile classpath -->
- <path id="javac.classpath">
- <path refid="xfire.classpath"/>
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- </path>
-
- <!-- The test client classpath -->
- <path id="tests.client.classpath">
+
+ <path id="ws.stack.classpath">
<path refid="sunri.classpath"/>
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
</path>
+ <path id="tests.extra.classpath">
+ </path>
+
</target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+ <target name="tests-compile" depends="tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.java.dir}"/>
+ </target>
+
</project>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -92,7 +92,7 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -27,8 +27,7 @@
-->
<target name="tests-init" depends="jars,tests-prepare">
- <path id="jbossws.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <path id="ws.stack.classpath">
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
@@ -36,43 +35,19 @@
<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
</path>
- <!-- The combined compile classpath -->
- <path id="javac.classpath">
- <path refid="jbossws.classpath"/>
- <path refid="thirdparty.classpath"/>
- <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
- <pathelement location="${thirdparty.dir}/qdox.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- <pathelement location="${jboss.home}/client/jboss-ejb3-client.jar"/>
+ <path id="tests.extra.classpath">
+ <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/>
+ <pathelement location="${core.dir}/thirdparty/policy.jar"/>
+ <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/>
</path>
- <!-- The test client classpath -->
- <path id="tests.client.classpath">
- <path refid="jbossws.classpath"/>
- <pathelement location="${jboss.client}/commons-logging.jar"/>
- <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
- <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.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}/jbossws-${jbossws.integration.target}.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"/>
+ <path refid="ws.stack.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" />
@@ -99,7 +74,7 @@
<!-- Define the JAX-WS wsconsume task -->
<taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
- <classpath refid="jbossws.classpath"/>
+ <classpath refid="ws.stack.classpath"/>
<classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
<classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
</taskdef>
@@ -141,7 +116,7 @@
<!-- Define the JAX-RPC tools task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
- <classpath refid="jbossws.classpath"/>
+ <classpath refid="ws.stack.classpath"/>
<classpath refid="thirdparty.classpath"/>
<classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
<classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
@@ -196,7 +171,7 @@
<!-- Define the JAX-WS wsprovide task -->
<taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide">
- <classpath refid="jbossws.classpath"/>
+ <classpath refid="ws.stack.classpath"/>
<classpath refid="thirdparty.classpath"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
@@ -206,25 +181,16 @@
</target>
<target name="tests-generate-resources" depends="servicegen,wstools,wsprovide">
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${tests.output.dir}/wstools/java"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
+ <macro-compile-classes srcdir="${tests.output.dir}/wstools/java"/>
</target>
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="wsconsume" description="Compile sources">
- <mkdir dir="${tests.output.dir}/classes"/>
- <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}"/>
- <src path="${tests.output.dir}/wsconsume/java"/>
- <classpath refid="javac.classpath"/>
- </javac>
+ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java"/>
+ <macro-compile-classes srcdir="${tests.java.dir}"/>
</target>
<!-- ================================================================== -->
@@ -233,7 +199,7 @@
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <copy-test-resources srcdir="${tests.dir}"/>
+ <macro-copy-resources srcdir="${tests.dir}"/>
</target>
<target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments.">
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-05-23 05:45:07 UTC (rev 3199)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxrpc.jbws84;
import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
import java.rmi.RemoteException;
import javax.xml.parsers.DocumentBuilder;
@@ -36,10 +35,9 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Document;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
/**
* @author Thomas.Diesler(a)jboss.org
* @since 26-Nov-2004
@@ -53,9 +51,8 @@
*/
public SOAPElement processSOAPElement(SOAPElement reqElement) throws RemoteException
{
- StringWriter swr = new StringWriter();
- DOM2Writer.serializeAsXML(reqElement, swr);
- log.info("processSOAPElement: " + swr);
+ String msgStr = DOMWriter.printNode(reqElement, true);
+ log.info("processSOAPElement: " + msgStr);
try
{
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-23 05:45:07 UTC (rev 3199)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxrpc.samples.message;
import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
import java.rmi.RemoteException;
import javax.xml.namespace.QName;
@@ -37,12 +36,11 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.utils.DOMUtils;
+import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
/**
* @author Thomas.Diesler(a)jboss.org
* @since 26-Nov-2004
@@ -56,9 +54,8 @@
*/
public SOAPElement processElement(SOAPElement msg) throws RemoteException
{
- StringWriter swr = new StringWriter();
- DOM2Writer.serializeAsXML(msg, swr);
- log.info("processElement: " + swr);
+ String msgStr = DOMWriter.printNode(msg, true);
+ log.info("processElement: " + msgStr);
try
{
@@ -122,7 +119,7 @@
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer();
transformer.transform(new DOMSource(doc), new DOMResult(parent));
- return (SOAPElement) parent.getChildElements().next();
+ return (SOAPElement)parent.getChildElements().next();
}
catch (RuntimeException e)
{
Modified: trunk/testsuite/ant-import/build-testsuite.xml
===================================================================
--- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198)
+++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199)
@@ -13,33 +13,19 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="tests-prepare">
-
- </target>
-
<!-- ================================================================== -->
- <!-- Compiling -->
+ <!-- Initialization -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <mkdir dir="${tests.output.dir}/classes"/>
- <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}"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
+ <target name="tests-init" depends="tests-prepare"/>
+
<!-- ================================================================== -->
<!-- Building -->
<!-- ================================================================== -->
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <copy-test-resources srcdir="${tests.dir}"/>
+ <macro-copy-resources srcdir="${tests.dir}"/>
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
18 years, 11 months
- 1
- 0
JBossWS SVN: r3198 - in trunk: integration/jboss42 and 15 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 00:03:24 -0400 (Wed, 23 May 2007)
New Revision: 3198
Added:
trunk/integration/jboss42/ant-import/build-release.xml
trunk/integration/jboss42/src/main/etc/
trunk/integration/jboss42/src/main/etc/component-info.xml
trunk/integration/jboss50/ant-import/build-release.xml
trunk/integration/jboss50/src/main/etc/
trunk/integration/jboss50/src/main/etc/component-info.xml
trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/FactoryLoader.java
Modified:
trunk/build/ant-import/build-release.xml
trunk/integration/jboss42/build.xml
trunk/integration/jboss50/build.xml
trunk/integration/jbws/ant-import/build-release.xml
trunk/integration/jbws/src/main/etc/component-info-jbws42.xml
trunk/integration/jbws/src/main/etc/component-info-jbws50.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SAAJMetaFactory.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java
Log:
Fix AS dependency on FactoryLoader
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/build/ant-import/build-release.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -41,6 +41,8 @@
<target name="release-to-repository" depends="prepare" description="Release to local repository">
<ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/>
+ <ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jbws.dir}/build.xml" target="release" inheritall="false"/>
</target>
Added: trunk/integration/jboss42/ant-import/build-release.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-release.xml (rev 0)
+++ trunk/integration/jboss42/ant-import/build-release.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- Release to jboss.local.repository -->
+ <target name="release" depends="jars"
+ description="Release to jboss.local.repository">
+
+ <!-- jboss/jbossws-jboss42 -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss42-src.zip"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="${build.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ </target>
+
+</project>
Property changes on: trunk/integration/jboss42/ant-import/build-release.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jboss42/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/jboss42/build.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -15,6 +15,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.jboss42.dir}/ant-import/build-release.xml"/>
<import file="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
Added: trunk/integration/jboss42/src/main/etc/component-info.xml
===================================================================
--- trunk/integration/jboss42/src/main/etc/component-info.xml (rev 0)
+++ trunk/integration/jboss42/src/main/etc/component-info.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -0,0 +1,21 @@
+<project name="jboss/jbossws-jboss42">
+
+ <component id="jboss/jbossws-jboss42"
+ description="JBossWS container integration layer"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-jboss42.jar"/>
+ <artifact id="jbossws-jboss42-src.zip"/>
+
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@repository.id@"/>
+ </import>
+
+ <export>
+ <include input="jbossws-jboss42.jar"/>
+ </export>
+
+ </component>
+
+</project>
Property changes on: trunk/integration/jboss42/src/main/etc/component-info.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/jboss50/ant-import/build-release.xml
===================================================================
--- trunk/integration/jboss50/ant-import/build-release.xml (rev 0)
+++ trunk/integration/jboss50/ant-import/build-release.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- Release to jboss.local.repository -->
+ <target name="release" depends="jars"
+ description="Release to jboss.local.repository">
+
+ <!-- jboss/jbossws-jboss50 -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true">
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50-src.zip"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="${build.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ </target>
+
+</project>
Property changes on: trunk/integration/jboss50/ant-import/build-release.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jboss50/build.xml
===================================================================
--- trunk/integration/jboss50/build.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/jboss50/build.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -15,6 +15,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.jboss50.dir}/ant-import/build-release.xml"/>
<import file="${int.jboss50.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
Added: trunk/integration/jboss50/src/main/etc/component-info.xml
===================================================================
--- trunk/integration/jboss50/src/main/etc/component-info.xml (rev 0)
+++ trunk/integration/jboss50/src/main/etc/component-info.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -0,0 +1,21 @@
+<project name="jboss/jbossws-jboss50">
+
+ <component id="jboss/jbossws-jboss50"
+ description="JBossWS container integration layer"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-jboss50.jar"/>
+ <artifact id="jbossws-jboss50-src.zip"/>
+
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@repository.id@"/>
+ </import>
+
+ <export>
+ <include input="jbossws-jboss50.jar"/>
+ </export>
+
+ </component>
+
+</project>
Property changes on: trunk/integration/jboss50/src/main/etc/component-info.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jbws/ant-import/build-release.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-release.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/jbws/ant-import/build-release.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -21,10 +21,6 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib" overwrite="true">
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-jboss50-src.zip"/>
- </fileset>
<fileset dir="${int.jbws.dir}/output/lib">
<include name="jbossws-jbws50.sar"/>
<include name="jbossws-jbws50-deployer.zip"/>
@@ -40,10 +36,6 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib" overwrite="true">
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss42-src.zip"/>
- </fileset>
<fileset dir="${int.jbws.dir}/output/lib">
<include name="jbossws-jbws42.sar"/>
</fileset>
Modified: trunk/integration/jbws/src/main/etc/component-info-jbws42.xml
===================================================================
--- trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -5,8 +5,6 @@
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-jboss42.jar"/>
- <artifact id="jbossws-jboss42-src.zip"/>
<artifact id="jbossws-jbws42.sar"/>
<import componentref="jboss/jbossxb">
@@ -18,6 +16,9 @@
<import componentref="jboss/jbossws">
<compatible version="@repository.id@"/>
</import>
+ <import componentref="jboss/jbossws-jboss50">
+ <compatible version="@repository.id@"/>
+ </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id@"/>
</import>
Modified: trunk/integration/jbws/src/main/etc/component-info-jbws50.xml
===================================================================
--- trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-23 04:03:24 UTC (rev 3198)
@@ -5,8 +5,6 @@
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-jboss50.jar"/>
- <artifact id="jbossws-jboss50-src.zip"/>
<artifact id="jbossws-jbws50.sar"/>
<artifact id="jbossws-jbws50-deployer.zip"/>
@@ -19,6 +17,9 @@
<import componentref="jboss/jbossws">
<compatible version="@repository.id@"/>
</import>
+ <import componentref="jboss/jbossws-jboss50">
+ <compatible version="@repository.id@"/>
+ </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id@"/>
</import>
Copied: trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java (from rev 3195, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/FactoryLoader.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -0,0 +1,197 @@
+/*
+ * 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;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+
+import org.jboss.logging.Logger;
+
+// $Id$
+
+/**
+ * Load a factory using the factory lookup procedure
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Dec-2006
+ */
+public class FactoryLoader
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(FactoryLoader.class);
+
+ private FactoryLoader()
+ {
+ }
+
+ /**
+ * Load a factory using this ordered lookup procedure
+ *
+ * 1. Use the system property
+ * 2. Use the properties file "lib/jaxm.properties" in the JRE directory
+ * 3. Use the Services API (as detailed in the JAR specification), if available, to determine the classname
+ * 4. Use the default factory implementation class
+ *
+ * @return the factory impl, or null
+ */
+ public static Object loadFactory(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the system property
+ PrivilegedAction action = new PropertyAccessAction(propertyName);
+ String factoryName = (String)AccessController.doPrivileged(action);
+ if (factoryName != null)
+ {
+ try
+ {
+ if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the properties file "lib/jaxm.properties" in the JRE directory.
+ // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
+ if (factory == null)
+ {
+ action = new PropertyAccessAction("java.home");
+ String javaHome = (String)AccessController.doPrivileged(action);
+ File jaxmFile = new File(javaHome + "/lib/jaxm.properties");
+ if (jaxmFile.exists())
+ {
+ try
+ {
+ action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
+ Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
+ factoryName = jaxmProperties.getProperty(propertyName);
+ if (factoryName != null)
+ {
+ if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+ }
+
+ // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
+ if (factory == null)
+ {
+ String filename = "META-INF/services/" + propertyName;
+ InputStream inStream = loader.getResourceAsStream(filename);
+ if (inStream != null)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
+ if (factoryName != null)
+ {
+ if(log.isTraceEnabled()) log.trace("Load from Service API " + filename + ": " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ try
+ {
+ factoryName = defaultFactory;
+ if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ return factory;
+ }
+
+ private static class PropertyAccessAction implements PrivilegedAction
+ {
+ private String name;
+
+ PropertyAccessAction(String name)
+ {
+ this.name = name;
+ }
+
+ public Object run()
+ {
+ return System.getProperty(name);
+ }
+ }
+
+ private static class PropertyFileAccessAction implements PrivilegedAction
+ {
+ private String filename;
+
+ PropertyFileAccessAction(String filename)
+ {
+ this.filename = filename;
+ }
+
+ public Object run()
+ {
+ try
+ {
+ InputStream inStream = new FileInputStream(filename);
+ Properties props = new Properties();
+ props.load(inStream);
+ return props;
+ }
+ catch (IOException ex)
+ {
+ throw new SecurityException("Cannot load properties: " + filename, ex);
+ }
+ }
+ }
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
/**
* A container idependent SecurityAdaptorFactory
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/FactoryLoader.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/FactoryLoader.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/FactoryLoader.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -1,197 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.utils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Properties;
-
-import org.jboss.logging.Logger;
-
-// $Id$
-
-/**
- * Load a factory using the factory lookup procedure
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Dec-2006
- */
-public class FactoryLoader
-{
- // provide logging
- private static Logger log = Logger.getLogger(FactoryLoader.class);
-
- private FactoryLoader()
- {
- }
-
- /**
- * Load a factory using this ordered lookup procedure
- *
- * 1. Use the system property
- * 2. Use the properties file "lib/jaxm.properties" in the JRE directory
- * 3. Use the Services API (as detailed in the JAR specification), if available, to determine the classname
- * 4. Use the default factory implementation class
- *
- * @return the factory impl, or null
- */
- public static Object loadFactory(String propertyName, String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the system property
- PrivilegedAction action = new PropertyAccessAction(propertyName);
- String factoryName = (String)AccessController.doPrivileged(action);
- if (factoryName != null)
- {
- try
- {
- if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the properties file "lib/jaxm.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
- if (factory == null)
- {
- action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxm.properties");
- if (jaxmFile.exists())
- {
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(propertyName);
- if (factoryName != null)
- {
- if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
- }
-
- // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- if (factory == null)
- {
- String filename = "META-INF/services/" + propertyName;
- InputStream inStream = loader.getResourceAsStream(filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- if (factoryName != null)
- {
- if(log.isTraceEnabled()) log.trace("Load from Service API " + filename + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- try
- {
- factoryName = defaultFactory;
- if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- return factory;
- }
-
- private static class PropertyAccessAction implements PrivilegedAction
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- try
- {
- InputStream inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- }
- }
-}
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
/**
A factory for creating SOAPMessage objects.
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SAAJMetaFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SAAJMetaFactory.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SAAJMetaFactory.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -21,7 +21,7 @@
*/
package javax.xml.soap;
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
// $Id$
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -25,7 +25,7 @@
import javax.xml.namespace.QName;
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
import org.w3c.dom.Element;
/** SOAPFactory is a factory for creating various objects that exist in the SOAP XML tree.
Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -33,7 +33,7 @@
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-05-22 20:32:33 UTC (rev 3197)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/HttpServer.java 2007-05-23 04:03:24 UTC (rev 3198)
@@ -28,7 +28,7 @@
import javax.xml.ws.Endpoint;
-import org.jboss.wsf.spi.utils.FactoryLoader;
+import org.jboss.ws.integration.FactoryLoader;
/**
* An abstract HTTP Server
18 years, 11 months
- 1
- 0