JBossWS SVN: r4888 - spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-25 08:13:53 -0400 (Thu, 25 Oct 2007)
New Revision: 4888
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
Log:
Deprecate legacy service ref handling
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2007-10-25 09:00:45 UTC (rev 4887)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2007-10-25 12:13:53 UTC (rev 4888)
@@ -42,10 +42,13 @@
enum Type {JAXRPC, JAXWS};
+ @Deprecated
ServiceRefMetaData newServiceRefMetaData();
+ @Deprecated
Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs);
+ @Deprecated
void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value);
void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException;
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2007-10-25 09:00:45 UTC (rev 4887)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2007-10-25 12:13:53 UTC (rev 4888)
@@ -47,8 +47,10 @@
public abstract void setProcessed(boolean flag);
+ @Deprecated
public abstract void importStandardXml(Element element);
+ @Deprecated
public abstract void importJBossXml(Element element);
public abstract void merge(ServiceRefMetaData targetRef);
17 years, 3 months
JBossWS SVN: r4887 - stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/webserviceref/META-INF-secure.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-25 05:00:45 -0400 (Thu, 25 Oct 2007)
New Revision: 4887
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
Log:
[JBAS-4891] Cannot unmarshall qname elements
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-10-25 08:59:37 UTC (rev 4886)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-10-25 09:00:45 UTC (rev 4887)
@@ -8,10 +8,10 @@
<service-ref>
<service-ref-name>SecureService1</service-ref-name>
<service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
@@ -26,9 +26,9 @@
<service-ref>
<service-ref-name>SecureService2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
@@ -43,7 +43,7 @@
<service-ref>
<service-ref-name>SecurePort1</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
<stub-property>
17 years, 3 months
JBossWS SVN: r4886 - in framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples: webserviceref/META-INF and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-25 04:59:37 -0400 (Thu, 25 Oct 2007)
New Revision: 4886
Modified:
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
Log:
[JBAS-4891] Cannot unmarshall qname elements
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -8,7 +8,7 @@
<service-ref-name>service2</service-ref-name>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpoint</service-endpoint-interface>
- <port-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:TestEndpointPort</port-qname>
+ <port-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}TestEndpointPort</port-qname>
</port-component-ref>
</service-ref-->
</jboss-client>
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -18,7 +18,7 @@
-->
<service-ref>
<service-ref-name>service2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -27,7 +27,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -36,7 +36,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service4</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -45,7 +45,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -54,7 +54,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -63,7 +63,7 @@
-->
<service-ref>
<service-ref-name>port1</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -72,7 +72,7 @@
-->
<service-ref>
<service-ref-name>Port2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -81,7 +81,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -90,7 +90,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port4</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -99,7 +99,7 @@
-->
<service-ref>
<service-ref-name>Port5</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -24,7 +24,7 @@
-->
<service-ref>
<service-ref-name>service2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -33,7 +33,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -42,7 +42,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service4</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -51,7 +51,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -60,7 +60,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -69,7 +69,7 @@
-->
<service-ref>
<service-ref-name>port1</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -78,7 +78,7 @@
-->
<service-ref>
<service-ref-name>Port2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -87,7 +87,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/port3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
</session>
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -11,7 +11,7 @@
<service-ref>
<service-ref-name>Service1</service-ref-name>
<service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -31,7 +31,7 @@
<service-ref>
<service-ref-name>Service3</service-ref-name>
<service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -54,7 +54,7 @@
<service-ref>
<service-ref-name>Port1</service-ref-name>
<port-component-ref>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
<config-name>Custom Client</config-name>
<config-file>META-INF/jbossws-client-config.xml</config-file>
</port-component-ref>
@@ -81,7 +81,7 @@
<service-ref-name>Port3</service-ref-name>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -8,10 +8,10 @@
<service-ref>
<service-ref-name>SecureService1</service-ref-name>
<service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
@@ -26,9 +26,9 @@
<service-ref>
<service-ref-name>SecureService2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
- <port-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointPort</port-qname>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
<stub-property>
<prop-name>javax.xml.ws.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
@@ -43,7 +43,7 @@
<service-ref>
<service-ref-name>SecurePort1</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:SecureEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
<stub-property>
Modified: framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2007-10-24 14:33:57 UTC (rev 4885)
+++ framework/branches/jbossws-framework-2.0.2/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2007-10-25 08:59:37 UTC (rev 4886)
@@ -18,7 +18,7 @@
-->
<service-ref>
<service-ref-name>service2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -27,7 +27,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -36,7 +36,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -45,7 +45,7 @@
-->
<service-ref>
<service-ref-name>TestEndpointService5</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -54,7 +54,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -63,7 +63,7 @@
-->
<service-ref>
<service-ref-name>port1</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -72,7 +72,7 @@
-->
<service-ref>
<service-ref-name>Port2</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
@@ -81,7 +81,7 @@
-->
<service-ref>
<service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name>
- <service-qname xmlns:ns1="http://org.jboss.ws/wsref">ns1:TestEndpointService</service-qname>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
</service-ref>
17 years, 3 months
JBossWS SVN: r4885 - in stack/native/branches/ropalka/trunk: src/main/java/org/jboss/ws/extensions/wsrm and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-24 10:33:57 -0400 (Wed, 24 Oct 2007)
New Revision: 4885
Added:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/createSequenceResponse.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/echoResponse.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
Removed:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/RMEndpointEmulator.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/test.log
Modified:
stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/ReqResService.wsdl
Log:
synchronizing local working copy with SVN
Modified: stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-24 14:33:57 UTC (rev 4885)
@@ -495,9 +495,8 @@
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsrm/emulator/**/*.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/emulator/resources">
- <include name="*.xml"/>
- <include name="*.wsdl"/>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/emulator">
+ <include name="resources/"/>
</webinf>
</war>
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-10-24 14:33:57 UTC (rev 4885)
@@ -28,7 +28,9 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.addressing.AddressingException;
import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.MessageContext.Scope;
@@ -39,6 +41,7 @@
import org.jboss.ws.extensions.wsrm.spi.Constants;
import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse;
/**
* TODO: add comment
@@ -99,7 +102,16 @@
protected boolean handleInbound(MessageContext msgContext)
{
if(log.isDebugEnabled()) log.debug("handleInbound");
- // TODO: implement
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ RMHandlerConstant.Operation operation = (RMHandlerConstant.Operation)msgContext.get(RMHandlerConstant.HANDLER_COMMAND);
+ if (operation == RMHandlerConstant.Operation.CREATE_SEQUENCE)
+ {
+ CreateSequenceResponse createSequenceResponse = rmProvider.getMessageFactory().newCreateSequenceResponse();
+ createSequenceResponse.deserializeFrom(soapMessage);
+ System.out.println("have wsrm identifier: " + createSequenceResponse.getIdentifier());
+ }
+
return true;
}
Added: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-10-24 14:33:57 UTC (rev 4885)
@@ -0,0 +1,191 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.wsrm.emulator;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Endpoint emulator
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Oct 24, 2007
+ */
+public class EndpointEmulator extends HttpServlet
+{
+ private static final String ADDR_NS = "http://www.w3.org/2005/08/addressing";
+ private static final Map<String, String> wsrmActions = new HashMap<String, String>();
+ private static final String CREATE_SEQUENCE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence";
+ private static final String CREATE_SEQUENCE_RESPONSE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequenceResponse";
+ private static final String CLOSE_SEQUENCE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequence";
+ private static final String CLOSE_SEQUENCE_RESPONSE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequenceResponse";
+ private static final String TERMINATE_SEQUENCE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequence";
+ private static final String TERMINATE_SEQUENCE_RESPONSE_ACTION = "http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequenceResponse";
+ private static final Random generator = new Random();
+
+ static
+ {
+ wsrmActions.put(CREATE_SEQUENCE_ACTION, CREATE_SEQUENCE_RESPONSE_ACTION);
+ wsrmActions.put(CLOSE_SEQUENCE_ACTION, CLOSE_SEQUENCE_RESPONSE_ACTION);
+ wsrmActions.put(TERMINATE_SEQUENCE_ACTION, TERMINATE_SEQUENCE_RESPONSE_ACTION);
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException
+ {
+ resp.setContentType("text/xml");
+ PrintWriter writer = resp.getWriter();
+ String wsdlFile = getResource("WEB-INF/resources/ReqResService.wsdl");
+ writer.print(wsdlFile);
+ writer.flush();
+ writer.close();
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException
+ {
+ resp.setContentType("text/xml");
+ PrintWriter writer = resp.getWriter();
+ Properties properties = getAddressingProperties(getRequestMessage(req));
+ String response = getResource("WEB-INF/resources/echoResponse.xml");
+ if (properties.get("addressing.action").equals(CREATE_SEQUENCE_ACTION))
+ response = getResource("WEB-INF/resources/createSequenceResponse.xml");
+ response = modifyResponse(response, properties);
+ writer.print(response);
+ writer.flush();
+ writer.close();
+ }
+
+ private String modifyResponse(String response, Properties props)
+ {
+ response = replace("${addressing.to}", props.getProperty("addressing.replyto"), response);
+ response = replace("${addressing.relatesto}", props.getProperty("addressing.messageid"), response);
+ String action = props.getProperty("addressing.action");
+ if (wsrmActions.containsKey(action))
+ {
+ if (action.equals(CREATE_SEQUENCE_ACTION))
+ {
+ String sequenceId = "http://wsrm.emulator.jboss/sequence/generated/" + generator.nextInt(Integer.MAX_VALUE);
+ response = replace("${messaging.identifier}", sequenceId, response);
+ }
+ action = wsrmActions.get(action);
+ }
+ response = replace("${addressing.action}", action, response);
+ return response;
+ }
+
+ private static String replace(String oldString, String newString, String data)
+ {
+ int fromIndex = 0;
+ int index = 0;
+ StringBuffer result = new StringBuffer();
+
+ while ((index = data.indexOf(oldString, fromIndex)) >= 0)
+ {
+ result.append(data.substring(fromIndex, index));
+ result.append(newString);
+ fromIndex = index + oldString.length();
+ }
+ result.append(data.substring(fromIndex));
+ return result.toString();
+ }
+
+ private Properties getAddressingProperties(String message) throws IOException
+ {
+ try
+ {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document document = builder.parse(new ByteArrayInputStream(message.getBytes()));
+ Properties retVal = new Properties();
+ String to = document.getElementsByTagNameNS(ADDR_NS, "To").item(0).getTextContent().trim();
+ retVal.put("addressing.to", to);
+ String messageId = document.getElementsByTagNameNS(ADDR_NS, "MessageID").item(0).getTextContent().trim();
+ retVal.put("addressing.messageid", messageId);
+ String action = document.getElementsByTagNameNS(ADDR_NS, "Action").item(0).getTextContent().trim();
+ retVal.put("addressing.action", action);
+ String replyTo = ((Element)document.getElementsByTagNameNS(ADDR_NS, "ReplyTo").item(0))
+ .getElementsByTagNameNS(ADDR_NS, "Address").item(0).getTextContent().trim();
+ retVal.put("addressing.replyto", replyTo);
+ System.out.println("Properties from message: " + retVal);
+ return retVal;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ throw new IOException(e.getMessage());
+ }
+ }
+
+ private String getResource(String resource) throws IOException
+ {
+ return toString(getServletContext().getResourceAsStream(resource));
+ }
+
+ private String getRequestMessage(HttpServletRequest req) throws IOException
+ {
+ BufferedReader reader = req.getReader();
+ String line = null;
+ StringBuilder sb = new StringBuilder();
+ while ((line = reader.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ return sb.toString();
+ }
+
+ private String toString(InputStream is) throws IOException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[1024];
+ int offset = -1;
+ while ((offset = is.read(buffer, 0, buffer.length)) != -1)
+ {
+ baos.write(buffer, 0, offset);
+ }
+ return baos.toString();
+ }
+
+}
\ No newline at end of file
Property changes on: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/RMEndpointEmulator.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/RMEndpointEmulator.java 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/RMEndpointEmulator.java 2007-10-24 14:33:57 UTC (rev 4885)
@@ -1,78 +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.test.ws.jaxws.wsrm.emulator;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * RM endpoint emulator
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 23, 2007
- */
-public class RMEndpointEmulator extends HttpServlet
-{
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
- {
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
- {
- String requestMessage = getRequestMessage(req);
- String responseMessage = getResponseMessage(requestMessage);
- resp.setContentType("text/xml");
- PrintWriter out = resp.getWriter();
- out.write(responseMessage);
- out.flush();
- out.close();
- }
-
- private String getResponseMessage(String requestMessage)
- {
- return "";
- }
-
- private String getRequestMessage(HttpServletRequest req) throws IOException
- {
- BufferedReader reader = req.getReader();
- String line = null;
- StringBuilder sb = new StringBuilder();
- while ((line = reader.readLine()) != null)
- {
- sb.append(line);
- }
- return sb.toString();
- }
-}
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-10-24 14:33:57 UTC (rev 4885)
@@ -21,7 +21,11 @@
*/
package org.jboss.test.ws.jaxws.wsrm.reqres;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.net.URL;
+import java.util.Properties;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -51,13 +55,28 @@
*/
public class ReqResTestCase extends JBossWSTest
{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-wsrm/ReqResService";
+ private static final Properties props = new Properties();
private static final String HELLO_WORLD_MSG = "Hello World";
private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm";
+ private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
private Exception handlerException;
private boolean asyncHandlerCalled;
private ReqResServiceIface proxy;
+ static
+ {
+ // load test properties
+ File propertiesFile = new File("resources/jaxws/wsrm/properties/ReqResTestCase.properties");
+ try
+ {
+ props.load(new FileInputStream(propertiesFile));
+ }
+ catch (IOException ignore)
+ {
+ ignore.printStackTrace();
+ }
+ }
+
private enum InvocationType
{
SYNC, ASYNC, ASYNC_FUTURE
@@ -65,7 +84,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(ReqResTestCase.class, "jaxws-wsrm.war, jaxws-wsrm-client.jar");
+ return new JBossWSTestSetup(ReqResTestCase.class, props.getProperty("archives"));
}
@Override
Modified: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/WEB-INF/web.xml 2007-10-24 14:33:57 UTC (rev 4885)
@@ -5,12 +5,12 @@
version="2.4">
<servlet>
- <servlet-name>RMEndpointEmulator</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.wsrm.emulator.RMEndpointEmulator</servlet-class>
+ <servlet-name>EndpointEmulator</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wsrm.emulator.EndpointEmulator</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>RMEndpointEmulator</servlet-name>
+ <servlet-name>EndpointEmulator</servlet-name>
<url-pattern>/ReqResService</url-pattern>
</servlet-mapping>
Modified: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/ReqResService.wsdl
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/ReqResService.wsdl 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/ReqResService.wsdl 2007-10-24 14:33:57 UTC (rev 4885)
@@ -33,7 +33,7 @@
</binding>
<service name="ReqResService">
<port name="ReqResPort" binding="tns:ReqResBinding">
- <soap:address location="http://127.0.0.1:8080/jaxws-wsrm/ReqResService"/>
+ <soap:address location="http://127.0.0.1:8080/jaxws-wsrm-emulator/ReqResService"/>
</port>
</service>
<wsp:Policy wsu:Id="exactly_one_in_order_rm_delivery" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/createSequenceResponse.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/createSequenceResponse.xml (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/createSequenceResponse.xml 2007-10-24 14:33:57 UTC (rev 4885)
@@ -0,0 +1,15 @@
+<env:Envelope
+ xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'
+ xmlns:wsrm11='http://docs.oasis-open.org/ws-rx/wsrm/200702'
+ xmlns:wsa='http://www.w3.org/2005/08/addressing'>
+ <env:Header>
+ <wsa:To>${addressing.to}</wsa:To>
+ <wsa:RelatesTo>${addressing.relatesto}</wsa:RelatesTo>
+ <wsa:Action>${addressing.action}</wsa:Action>
+ </env:Header>
+ <env:Body xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <wsrm11:CreateSequenceResponse>
+ <wsrm11:Identifier>${messaging.identifier}</wsrm11:Identifier>
+ </wsrm11:CreateSequenceResponse>
+ </env:Body>
+</env:Envelope>
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/createSequenceResponse.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/echoResponse.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/echoResponse.xml (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/echoResponse.xml 2007-10-24 14:33:57 UTC (rev 4885)
@@ -0,0 +1,15 @@
+<env:Envelope
+ xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'
+ xmlns:wsrm='http://docs.oasis-open.org/ws-rx/wsrm/200702'
+ xmlns:wsa='http://www.w3.org/2005/08/addressing'>
+ <env:Header xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <wsa:To>${addressing.to}</wsa:To>
+ <wsa:RelatesTo>${addressing.relatesto}</wsa:RelatesTo>
+ <wsa:Action>${addressing.action}</wsa:Action>
+ </env:Header>
+ <env:Body xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <ns1:echoResponse xmlns:ns1='http://org.jboss.ws/jaxws/wsrm'>
+ <result>Hello World</result>
+ </ns1:echoResponse>
+ </env:Body>
+</env:Envelope>
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/echoResponse.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/test.log
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/test.log 2007-10-24 14:02:59 UTC (rev 4884)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/emulator/resources/test.log 2007-10-24 14:33:57 UTC (rev 4885)
@@ -1,8 +0,0 @@
-<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
- <env:Header/>
- <env:Body>
- <ns1:echoResponse xmlns:ns1='http://org.jboss.ws/jaxws/wsrm'>
- <result>Hello World</result>
- </ns1:echoResponse>
- </env:Body>
-</env:Envelope>
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties 2007-10-24 14:33:57 UTC (rev 4885)
@@ -0,0 +1,5 @@
+port=8080
+#path=/jaxws-wsrm/ReqResService
+path=/jaxws-wsrm-emulator/ReqResService
+#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
+archives=jaxws-wsrm-emulator.war, jaxws-wsrm-client.jar
\ No newline at end of file
17 years, 3 months
JBossWS SVN: r4884 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-24 10:02:59 -0400 (Wed, 24 Oct 2007)
New Revision: 4884
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix some excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 13:29:25 UTC (rev 4883)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 14:02:59 UTC (rev 4884)
@@ -9,8 +9,8 @@
org/jboss/test/ws/jaxrpc/jbws1427/**
# [JBAS-4902] nested jar not deployed
+org/jboss/test/ws/jaxrpc/jbws165/**
org/jboss/test/ws/jaxws/jbws1813/**
-org/jboss/test/ws/jaxws/jbws165/**
# [JBAS-4890] EJBAccessException: Caller unauthorized
org/jboss/test/ws/jaxws/jbws1840/**
17 years, 3 months
JBossWS SVN: r4883 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-24 09:29:25 -0400 (Wed, 24 Oct 2007)
New Revision: 4883
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix some excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 13:10:52 UTC (rev 4882)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 13:29:25 UTC (rev 4883)
@@ -45,6 +45,7 @@
org/jboss/test/ws/jaxrpc/jbws381/**
org/jboss/test/ws/jaxrpc/jbws383/**
org/jboss/test/ws/jaxrpc/jbws413/**
+org/jboss/test/ws/jaxrpc/jbws414/**
org/jboss/test/ws/jaxrpc/jbws423/**
org/jboss/test/ws/jaxrpc/jbws424/**
org/jboss/test/ws/jaxrpc/jbws425/**
@@ -55,6 +56,7 @@
org/jboss/test/ws/jaxrpc/jbws484/**
org/jboss/test/ws/jaxrpc/jbws626/**
org/jboss/test/ws/jaxrpc/jbws632/**
+org/jboss/test/ws/jaxrpc/jbws637/**
org/jboss/test/ws/jaxrpc/jbws643/**
org/jboss/test/ws/jaxrpc/jbws663/**
org/jboss/test/ws/jaxrpc/jbws663b/**
@@ -88,12 +90,17 @@
org/jboss/test/ws/jaxrpc/jbws1653/**
org/jboss/test/ws/jaxrpc/jbws1792/**
org/jboss/test/ws/jaxrpc/jbws1792/**
-org/jboss/test/ws/jaxrpc/marshall-doclit/**
-org/jboss/test/ws/jaxrpc/marshall-rpclit/**
+org/jboss/test/ws/jaxrpc/marshall/**
org/jboss/test/ws/jaxrpc/overloaded/**
+org/jboss/test/ws/jaxrpc/serviceref/**
+org/jboss/test/ws/jaxrpc/utf16/**
+org/jboss/test/ws/jaxrpc/wsse/**
+org/jboss/test/ws/jaxrpc/xop/**
org/jboss/test/ws/jaxws/samples/serviceref/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/samples/wsaddressing/replyto/**
+org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/wsaddressing/replyto/**
# [JBAS-4903] EJB 2.1 view cannot be realized
org/jboss/test/ws/jaxws/jbws944/**
17 years, 3 months
JBossWS SVN: r4882 - in stack/native/branches/jbossws-native-2.0.2: src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo and 12 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-24 09:10:52 -0400 (Wed, 24 Oct 2007)
New Revision: 4882
Added:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml
Modified:
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java
Log:
[JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
use explicit context root
Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-24 13:10:52 UTC (rev 4882)
@@ -2547,11 +2547,9 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
- <!-- jaxrpc-jbws1762 -->
- <war
- warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
- webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml">
+
+ <!-- jaxrpc-jbws1762 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/>
@@ -2559,17 +2557,26 @@
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+ <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-jbws1762-packaged.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
+ <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
- <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
- <unwar
- src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
- dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"
- />
-
- <!-- jaxrpc-jbws1792 -->
+ <!-- jaxrpc-jbws1792 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpoint.class"/>
@@ -2579,11 +2586,10 @@
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="custom-endpoint-config.xml"/>
+ <include name="custom-endpoint-config.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
-
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1792-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jbws1792/TestEndpoint.class"/>
@@ -2597,27 +2603,8 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxrpc-jbws1762-packaged.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
- <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/>
- <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
- <copy
- file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"
- todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
- <unwar
- src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
- dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"
- />
-
- <!-- jaxrpc-marshall-doclit.war -->
+
+ <!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
@@ -3259,4 +3246,4 @@
</target>
-</project>
+</project>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-24 13:10:52 UTC (rev 4882)
@@ -9,13 +9,13 @@
<!-- $Id$ -->
<project>
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/libs"/>
@@ -374,26 +374,19 @@
<include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/>
</fileset>
</jar>
-
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
- <unjar
- src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"
- dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"
- />
-
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
+ <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
<war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/>
</classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
</war>
-
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
- <unwar
- src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war"
- dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"
- />
-
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar">
<fileset dir="${tests.output.dir}/libs">
<include name="jaxws-jbws1762-packaged.war"/>
@@ -402,17 +395,10 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
-
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <copy
- file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml"
- todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <unwar
- src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war"
- dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"
- />
-
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/>
<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear">
<fileset dir="${tests.output.dir}/libs">
<include name="jaxws-jbws1762-packaged.jar"/>
@@ -423,25 +409,14 @@
<include name="jboss-app.xml"/>
</metainf>
</jar>
-
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <copy
- file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml"
- todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <copy
- file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml"
- todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <unwar
- src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war"
- dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"
- />
- <unjar
- src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"
- dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"
- />
-
- <!-- jaxws-jbws1797 -->
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
+ <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
+
+ <!-- jaxws-jbws1797 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/>
@@ -663,147 +638,143 @@
<antcall target="build-interop-jars"/>
</target>
-
- <target name="build-interop-jars">
-
- <!-- Root.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war"
- webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
- <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/root">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- jbossws-interop-BaseDataTypesDocLitB.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- jbossws-interop-BaseDataTypesDocLitW.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- jbossws-interop-BaseDataTypesRpcLit.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
- webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- jbossws-interop-wsa10.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war"
- webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${tests.output.dir}/resources/interop/wsa">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- jbossws-interop-wsse10Encrypt.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war"
- webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
-
- <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
- <include name="wsdl/**.*"/>
- <include name="jboss-wsse-server.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
-
- <fileset dir="${tests.output.dir}/resources/interop/wsse/">
- <include name="*.*"/>
- </fileset>
- </war>
- <!-- jbossws-interop-wsse10Encrypt-client.jar -->
- <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
- <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/>
- </jar>
-
- <!-- jbossws-interop-wsse10Sign.war -->
- <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war"
- webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
- <include name="org/jboss/test/ws/interop/*.class"/>
- </classes>
-
- <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
- <include name="wsdl/**.*"/>
- <include name="jboss-wsse-server.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
-
- <fileset dir="${tests.output.dir}/resources/interop/wsse/">
- <include name="*.*"/>
- </fileset>
- </war>
- <!-- jbossws-interop-wsse10Sign-client.jar -->
- <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
- <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
- </jar>
-
- <!-- wrap up in an *.ear for easier deployment -->
- <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml">
- <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/>
- </ear>
-
- </target>
-
-</project>
+
+ <target name="build-interop-jars">
+
+ <!-- Root.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
+ <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/root">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- jbossws-interop-BaseDataTypesDocLitB.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- jbossws-interop-BaseDataTypesDocLitW.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- jbossws-interop-BaseDataTypesRpcLit.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
+ webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- jbossws-interop-wsa10.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/wsa">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
+ <!-- jbossws-interop-wsse10Encrypt.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+
+ <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+ <!-- jbossws-interop-wsse10Encrypt-client.jar -->
+ <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/>
+ </jar>
+
+ <!-- jbossws-interop-wsse10Sign.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+
+ <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+ <!-- jbossws-interop-wsse10Sign-client.jar -->
+ <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
+ </jar>
+
+ <!-- wrap up in an *.ear for easier deployment -->
+ <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml">
+ <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/>
+ </ear>
+
+ </target>
+
+</project>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-exploded/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-exploded/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-packaged/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-packaged/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-exploded/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-exploded/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-exploded/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-packaged/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-packaged/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxws-jbws1762-packaged/POJOBean?wsdl";
+ return "jaxws-jbws1762/POJOBean?wsdl";
}
}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-10-24 12:56:38 UTC (rev 4881)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-10-24 13:10:52 UTC (rev 4882)
@@ -33,11 +33,7 @@
import javax.jws.WebService;
@Stateless
-@WebService
-(
- name = "JBWS1762EJB3",
- serviceName = "JBWS1762EJB3Service"
-)
+@WebService(name = "JBWS1762EJB3", serviceName = "JBWS1762EJB3Service")
public class EJB3Bean
{
@WebMethod
Added: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml 2007-10-24 13:10:52 UTC (rev 4882)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxrpc-jbws1762</context-root>
+</jboss-web>
\ No newline at end of file
Added: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml 2007-10-24 13:10:52 UTC (rev 4882)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-jbws1762</context-root>
+</jboss-web>
\ No newline at end of file
17 years, 3 months
JBossWS SVN: r4881 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-24 08:56:38 -0400 (Wed, 24 Oct 2007)
New Revision: 4881
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix some excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 11:05:30 UTC (rev 4880)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 12:56:38 UTC (rev 4881)
@@ -4,13 +4,18 @@
# [JBAS-4901] Reverse paths are not allowed (containing a . or ..)
org/jboss/test/ws/jaxws/jbws1798/**
+# [JBAS-4896] NPE in JBossMetaDataWrapper
+org/jboss/test/ws/jaxrpc/jbas897/**
+org/jboss/test/ws/jaxrpc/jbws1427/**
+
# [JBAS-4902] nested jar not deployed
org/jboss/test/ws/jaxws/jbws1813/**
+org/jboss/test/ws/jaxws/jbws165/**
# [JBAS-4890] EJBAccessException: Caller unauthorized
org/jboss/test/ws/jaxws/jbws1840/**
org/jboss/test/ws/jaxws/samples/context/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
+#org/jboss/test/ws/jaxws/samples/wssecurity/**
# [JBAS-4895] JAXB based ServiceRef meta data
org/jboss/test/ws/benchmark/jaxrpc/**
@@ -73,7 +78,9 @@
org/jboss/test/ws/jaxrpc/jbws1107/**
org/jboss/test/ws/jaxrpc/jbws1121/**
org/jboss/test/ws/jaxrpc/jbws1124/**
+org/jboss/test/ws/jaxrpc/jbws1125/**
org/jboss/test/ws/jaxrpc/jbws1148/**
+org/jboss/test/ws/jaxrpc/jbws1179/**
org/jboss/test/ws/jaxrpc/jbws1190/**
org/jboss/test/ws/jaxrpc/jbws1205/**
org/jboss/test/ws/jaxrpc/jbws1303/**
17 years, 3 months
JBossWS SVN: r4880 - in stack/metro/trunk: ant-import and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-24 07:05:30 -0400 (Wed, 24 Oct 2007)
New Revision: 4880
Added:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/DumpPipe.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/MessageLogPipelineHook.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/VFSResourceLoader.java
Removed:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java
Modified:
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/injection/JBossResourceInjector.java
stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
stack/metro/trunk/version.properties
Log:
Registry refactoring: svn merge -r4849:HEAD https://svn.jboss.org/repos/jbossws/stack/metro/branches/hbraun
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-24 11:05:30 UTC (rev 4880)
@@ -57,9 +57,11 @@
<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-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.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-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/>
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -75,9 +75,7 @@
import com.sun.xml.ws.util.xml.XmlUtil;
/**
- * A copy of DeploymentDescriptorParser that externalizes
- *
- * {@link createInvoker(Class)}
+ * A copy of DeploymentDescriptorParser
*
*
* @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
@@ -94,6 +92,8 @@
private final ResourceLoader loader;
private final AdapterFactory<A> adapterFactory;
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
+
/**
* Endpoint names that are declared.
* Used to catch double definitions.
@@ -123,8 +123,22 @@
this.container = container;
this.adapterFactory = adapterFactory;
- collectDocs("/WEB-INF/wsdl/");
- logger.fine("war metadata=" + docs);
+ // toggle EJB and WEB deployments
+ String resourcePath = "/META-INF/";
+ try
+ {
+ loader.getResource(resourcePath);
+ log.warn("bypass collectDocs(), it doesnt work for EJB endpoints");
+ }
+ catch (MalformedURLException e)
+ {
+ resourcePath = "/WEB-INF/";
+ log.debug("Collecting docs from " + resourcePath);
+
+ collectDocs(resourcePath+"wsdl/");
+ logger.fine("metadata=" + docs);
+ }
+
}
/**
@@ -393,16 +407,17 @@
if (wsdlFile != null)
{
- if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR))
+ /*if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR))
{
logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL.");
return null;
- }
+ }*/
URL wsdl;
try
{
- wsdl = loader.getResource('/' + wsdlFile);
+ //wsdl = loader.getResource('/' + wsdlFile);
+ wsdl = loader.getResource(wsdlFile);
}
catch (MalformedURLException e)
{
@@ -412,6 +427,10 @@
{
throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr);
}
+
+ // bypass the docs init
+ docs.put(wsdl.toExternalForm(), SDDocumentSource.create(wsdl));
+
SDDocumentSource docInfo = docs.get(wsdl.toExternalForm());
assert docInfo != null;
return docInfo;
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -23,27 +23,25 @@
//$Id$
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.RequestHandler;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-
-import com.sun.xml.ws.transport.http.servlet.WSServlet;
-import com.sun.xml.ws.transport.http.servlet.WSServletDelegate;
-
/**
* A request handler
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
@@ -58,40 +56,87 @@
public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
{
- WSServletDelegate delegate = (WSServletDelegate)context.getAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO);
- if (delegate == null)
- throw new IllegalStateException("Cannot obtain servlet delegate");
-
+ ServletAdapter target = endpoint.getAttachment(ServletAdapter.class);
+ if(null == target)
+ throw new IllegalArgumentException("Cannot obtain ServletAdapter");
+
String method = req.getMethod();
if (method.equals("POST"))
{
- delegate.doPost(req, res, context);
+ doPost(target, context, req, res);
}
- else if (method.equals("GET"))
+ else if(method.equals("GET"))
{
- delegate.doGet(req, res, context);
+ doGet(target, req, context, res);
}
- else if (method.equals("PUT"))
+ else
{
- delegate.doPut(req, res, context);
+ throw new WebServiceException("Unsupported method: " + method);
}
- else if (method.equals("DELETE"))
+ }
+
+ private void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
+ throws ServletException
+ {
+ try {
+
+ if (target != null)
+ {
+ String query = req.getQueryString();
+ if (target.isMetadataQuery(query)) {
+ // Sends published WSDL and schema documents
+ target.publishWSDL(context, req, res);
+ return;
+ }
+ else
+ {
+ sendResponse(405, "HTTP GET not supported", res);
+ }
+ }
+ else
+ {
+ sendResponse(404, "Not found", res);
+ }
+ }
+ catch (Exception e)
{
- delegate.doDelete(req, res, context);
+ log.error("Failed to process GET request", e);
+ throw new ServletException(e.getMessage());
}
- else
+ }
+
+ private static void sendResponse(int status, String message, HttpServletResponse res)
+ throws IOException
+ {
+ res.setStatus(status);
+ res.setContentType("text/plain");
+ Writer out = res.getWriter();
+ out.write(message);
+ out.close();
+ }
+
+ private void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
+ {
+ try
{
- throw new WebServiceException("Unsupported method: " + method);
+ target.handle(context, req, res);
}
+ catch (Throwable e)
+ {
+ log.error("Failed to process POST request", e);
+ res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
}
+
+
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
{
- throw new IllegalArgumentException("Not implemented");
+ throw new IllegalArgumentException("JBWS-1869: Not implemented");
}
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- throw new IllegalArgumentException("Not implemented");
+ throw new IllegalArgumentException("JBWS-1869: Not implemented");
}
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -28,6 +28,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint;
import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints;
+import org.jboss.wsf.stack.sunri.metadata.RuntimeModelDeploymentAspect;
import javax.xml.ws.BindingType;
import javax.xml.ws.soap.SOAPBinding;
@@ -81,7 +82,7 @@
contextParams = new HashMap<String, String>();
dep.setProperty(propKey, contextParams);
}
- contextParams.put(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm());
+ contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm());
}
}
Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -1,189 +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.stack.sunri;
-
-// $Id$
-
-import com.sun.istack.NotNull;
-import com.sun.xml.ws.api.server.BoundEndpoint;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.Module;
-import com.sun.xml.ws.api.server.ResourceInjector;
-import com.sun.xml.ws.resources.WsservletMessages;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
-import com.sun.xml.ws.transport.http.servlet.WSServlet;
-import com.sun.xml.ws.transport.http.servlet.WSServletDelegate;
-
-import javax.servlet.*;
-import javax.xml.ws.WebServiceException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * A copy of WSServletContextListener that externalizes
- *
- * getDeploymentDescriptorURL()
- * createDeploymentDescriptorParser()
- *
- * @author WS Development Team
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class WSServletContextListenerExt implements ServletContextAttributeListener, ServletContextListener
-{
- private WSServletDelegate delegate;
-
- public void attributeAdded(ServletContextAttributeEvent event)
- {
- }
-
- public void attributeRemoved(ServletContextAttributeEvent event)
- {
- }
-
- public void attributeReplaced(ServletContextAttributeEvent event)
- {
- }
-
- public void contextInitialized(ServletContextEvent event)
- {
- if (logger.isLoggable(Level.INFO))
- {
- logger.info(WsservletMessages.LISTENER_INFO_INITIALIZE());
- }
- ServletContext context = event.getServletContext();
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
-
- ServletContainer container = new ServletContainer(context);
- try
- {
- ServletResourceLoader resourceLoader = new ServletResourceLoader(context);
- ServletAdapterList adapterList = new ServletAdapterList();
-
- // Parse the descriptor file and build endpoint infos
- DeploymentDescriptorParserExt<ServletAdapter> parser = createDeploymentDescriptorParser(classLoader, container, resourceLoader, adapterList);
-
- URL sunJaxWsXml = getDeploymentDescriptorURL(context);
- List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
-
- delegate = new WSServletDelegate(adapters, context);
-
- context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate);
- }
- catch (Throwable e)
- {
- logger.log(Level.SEVERE, WsservletMessages.LISTENER_PARSING_FAILED(e), e);
- context.removeAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO);
- throw new WebServiceException("listener.parsingFailed", e);
- }
- }
-
- public void contextDestroyed(ServletContextEvent event)
- {
- if (delegate != null)
- { // the deployment might have failed.
- delegate.destroy();
- }
-
- if (logger.isLoggable(Level.INFO))
- {
- logger.info(WsservletMessages.LISTENER_INFO_DESTROY());
- }
- }
-
- /**
- * Externalized for integration
- */
- protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container,
- ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException
- {
- DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserExt<ServletAdapter>(classLoader, resourceLoader, container, adapterList);
- return parser;
- }
-
- /**
- * Externalized for integration
- */
- protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException
- {
- URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME);
- return sunJaxWsXml;
- }
-
- /**
- * Provides access to {@link ServletContext} via {@link Container}. Pipes
- * can get ServletContext from Container and use it to load some resources.
- */
- static class ServletContainer extends Container
- {
- private final ServletContext servletContext;
-
- private final Module module = new Module()
- {
- private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
-
- public @NotNull
- List<BoundEndpoint> getBoundEndpoints()
- {
- return endpoints;
- }
- };
-
- ServletContainer(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- public <T> T getSPI(Class<T> spiType)
- {
- if (spiType == ServletContext.class)
- {
- return (T)servletContext;
- }
- else if (spiType == Module.class)
- {
- return spiType.cast(module);
- }
- else if(spiType == ResourceInjector.class)
- {
- return (T)ResourceInjector.STANDALONE;
- }
-
- logger.log(Level.WARNING, "Unable to resolve SPI for type: " + spiType);
- return null;
- }
- }
-
- protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
-
- private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
-}
Deleted: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -1,81 +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.stack.sunri;
-
-// $Id$
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.servlet.ServletContext;
-import javax.xml.ws.WebServiceException;
-
-import com.sun.xml.ws.resources.WsservletMessages;
-import com.sun.xml.ws.transport.http.HttpAdapter;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-
-/**
- * Parses {@code sun-jaxws.xml} and sets up
- * {@link HttpAdapter}s for all deployed endpoints.
- *
- * <p>
- * This code is the entry point at the server side.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 18-May-2007
- */
-public class WSServletContextListenerJBWS extends WSServletContextListenerExt
-{
- public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
-
- /**
- * Fall back to the 'jbossws-sun-jaxws-url' init parameter for the URL location
- * of sun-jaxws.xml
- */
- @Override
- protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException
- {
- URL sunJaxWsXml = super.getDeploymentDescriptorURL(context);
- if (sunJaxWsXml == null)
- {
- String urlStr = context.getInitParameter(PARAM_SUN_JAXWS_URL);
- if (urlStr != null && urlStr.length() > 0)
- sunJaxWsXml = new URL(urlStr);
- }
- if (sunJaxWsXml == null)
- throw new WebServiceException(WsservletMessages.NO_SUNJAXWS_XML(JAXWS_RI_RUNTIME));
-
- return sunJaxWsXml;
- }
-
- /**
- * Externalized for integration
- */
- @Override
- protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container,
- ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException
- {
- DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList);
- return parser;
- }
-}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/injection/JBossResourceInjector.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/injection/JBossResourceInjector.java 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/injection/JBossResourceInjector.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -24,9 +24,8 @@
import com.sun.istack.NotNull;
import com.sun.xml.ws.api.server.ResourceInjector;
import com.sun.xml.ws.api.server.WSWebServiceContext;
+import org.jboss.logging.Logger;
-import javax.xml.ws.WebServiceContext;
-
/**
* Default {@link ResourceInjector}.
*
@@ -35,6 +34,8 @@
*/
public final class JBossResourceInjector extends ResourceInjector {
+ private static final org.jboss.logging.Logger log = Logger.getLogger(JBossResourceInjector.class);
+
public void inject(@NotNull WSWebServiceContext context, @NotNull Object instance) {
// AbstractInstanceResolver.buildInjectionPlan(
// instance.getClass(),
@@ -42,6 +43,6 @@
// false
// ).inject(instance,context);
- System.out.println("!!! inject " + context+ " into " + instance);
+ log.warn("Context injection not implemeted, failed to inject " + context+ " into " + instance);
}
}
Copied: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/DumpPipe.java (from rev 4876, stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/log/DumpPipe.java)
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/DumpPipe.java (rev 0)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/DumpPipe.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -0,0 +1,171 @@
+/*
+ * 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.stack.sunri.log;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.pipe.Pipe;
+import com.sun.xml.ws.api.pipe.PipeCloner;
+import com.sun.xml.ws.api.pipe.helper.AbstractFilterPipeImpl;
+import org.jboss.logging.Logger;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Constructor;
+
+/**
+ * {@link Pipe} that dumps messages that pass through.
+ * Borrowed from the SUN-RI sources.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Heiko Braun
+ */
+public class DumpPipe extends AbstractFilterPipeImpl {
+
+ private static Logger msgLog = Logger.getLogger("org.jboss.wsf.spi.MessageTrace");
+
+ private final String name;
+
+ private final PrintStream out;
+
+ private final XMLOutputFactory staxOut;
+
+ /**
+ * @param name
+ * Specify the name that identifies this {@link DumpPipe}
+ * instance. This string will be printed when this pipe
+ * dumps messages, and allows people to distinguish which
+ * pipe instance is dumping a message when multiple
+ * {@link DumpPipe}s print messages out.
+ * @param out
+ * The output to send dumps to.
+ * @param next
+ * The next {@link Pipe} in the pipeline.
+ */
+ public DumpPipe(String name, PrintStream out, Pipe next) {
+ super(next);
+ this.name = name;
+ this.out = out;
+ this.staxOut = XMLOutputFactory.newInstance();
+ //staxOut.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES,true);
+ }
+
+ /**
+ * @param out
+ * The output to send dumps to.
+ * @param next
+ * The next {@link Pipe} in the pipeline.
+ *
+ * @deprecated
+ * use {@link #DumpPipe(String, PrintStream, Pipe)}
+ */
+ public DumpPipe(PrintStream out, Pipe next) {
+ this("DumpPipe",out,next);
+ }
+
+ /**
+ * Copy constructor.
+ */
+ private DumpPipe(DumpPipe that, PipeCloner cloner) {
+ super(that,cloner);
+ this.name = that.name;
+ this.out = that.out;
+ this.staxOut = that.staxOut;
+ }
+
+ public Packet process(Packet packet) {
+ dump("request",packet);
+ Packet reply = next.process(packet);
+ dump("response",reply);
+ return reply;
+ }
+
+ private void dump(String header, Packet packet) {
+
+ if(!msgLog.isTraceEnabled())
+ return;
+
+ msgLog.trace("====["+name+":"+header+"]====");
+ if(packet.getMessage()==null)
+ {
+ msgLog.trace("(none)");
+ }
+ else
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+
+ try {
+
+ XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout) {
+ public void close() {
+ // noop
+ }
+ });
+ writer = createIndenter(writer);
+ packet.getMessage().copy().writeTo(writer);
+ writer.close();
+
+ } catch (XMLStreamException e) {
+ e.printStackTrace(new PrintStream(bout));
+ }
+
+ msgLog.trace(new String(bout.toByteArray()));
+ }
+
+ msgLog.trace("============");
+ }
+
+ /**
+ * Wraps {@link XMLStreamWriter} by an indentation engine if possible.
+ *
+ * <p>
+ * We can do this only when we have <tt>stax-utils.jar</tt> in the classpath.
+ */
+ private XMLStreamWriter createIndenter(XMLStreamWriter writer) {
+ try {
+ Class clazz = getClass().getClassLoader().loadClass("javanet.staxutils.IndentingXMLStreamWriter");
+ Constructor c = clazz.getConstructor(XMLStreamWriter.class);
+ writer = (XMLStreamWriter)c.newInstance(writer);
+ } catch (Exception e) {
+ // if stax-utils.jar is not in the classpath, this will fail
+ // so, we'll just have to do without indentation
+ if(!warnStaxUtils) {
+ warnStaxUtils = true;
+ msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent the dump output");
+ }
+ }
+ return writer;
+ }
+
+
+ public Pipe copy(PipeCloner cloner) {
+ return new DumpPipe(this,cloner);
+ }
+
+ public void preDestroy() {
+ // noop
+ }
+
+ private static boolean warnStaxUtils;
+}
Copied: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/MessageLogPipelineHook.java (from rev 4876, stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/log/MessageLogPipelineHook.java)
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/MessageLogPipelineHook.java (rev 0)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/log/MessageLogPipelineHook.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -0,0 +1,42 @@
+/*
+ * 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.stack.sunri.log;
+
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.api.pipe.Pipe;
+import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
+import com.sun.istack.NotNull;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class MessageLogPipelineHook extends ServerPipelineHook
+{
+
+ public
+ @NotNull
+ Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, @NotNull Pipe tail)
+ {
+ return new DumpPipe("Message Log", System.out, tail);
+ }
+}
Copied: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java (from rev 4876, stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java)
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java (rev 0)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -0,0 +1,201 @@
+/*
+ * 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.stack.sunri.metadata;
+
+import com.sun.istack.NotNull;
+import com.sun.xml.ws.api.server.BoundEndpoint;
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.Module;
+import com.sun.xml.ws.api.server.ResourceInjector;
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.stack.sunri.DeploymentDescriptorParserExt;
+import org.jboss.wsf.stack.sunri.log.MessageLogPipelineHook;
+
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Creates a Metro runtime model and associates it with the deployment.
+ * Doing so requires a valid runtime loader present, that will act as a temporary
+ * thread local classloader. <p>The <code>spi.Endpoint</code> carries a Metro <code>ServletAdapter</code>
+ * that is associated with the runtime model:<br>
+ * <code>(Endpoint.getAttachment(ServletAdapter.class))</code>
+ * This adapter acts as the main entry point for SOAP/HTTP requests.
+ * Please note that the current implementation doesnt support the stream based RequestHandler API.
+ *
+ * @see org.jboss.wsf.stack.sunri.RequestHandlerImpl
+ * @see org.jboss.wsf.stack.sunri.DeploymentDescriptorParserExt
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class RuntimeModelDeploymentAspect extends DeploymentAspect
+{
+ private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class);
+
+ protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
+
+ public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
+
+ public void create(Deployment deployment)
+ {
+ ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
+ if(null == runtimeLoader)
+ throw new IllegalArgumentException("Null runtimeLoader");
+
+ ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
+ JBossWSContainer container = new JBossWSContainer();
+
+ try
+ {
+ // Metro uses the thread contetx classloader in several places
+ Thread.currentThread().setContextClassLoader(runtimeLoader);
+
+ ResourceLoaderAdapter resourceLoaderAdapter = new ResourceLoaderAdapter(runtimeLoader);
+ ResourceLoader resourceLoader = new VFSResourceLoader(resourceLoaderAdapter);
+
+ // TODO: refactor to general HTTPAdapter usage
+ ServletAdapterList adapterList = new ServletAdapterList();
+
+ // Parse the descriptor file and build endpoint infos
+ DeploymentDescriptorParserExt<ServletAdapter> parser =
+ createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
+
+ //URL sunJaxWsXml = getDDUrlFromResourceLoader(resourceLoaderAdapter);
+ URL sunJaxWsXml = getDDUrlFromContext(deployment);
+
+ List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
+
+ for(ServletAdapter adapter : adapters)
+ {
+ for(Endpoint ep : deployment.getService().getEndpoints() )
+ {
+ // TODO matching need to be improved
+ if(ep.getShortName().equals(adapter.getName())&&
+ ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass()))
+ {
+ ep.addAttachment(ServletAdapter.class, adapter);
+ break;
+ }
+ }
+ }
+
+ }
+ catch (Throwable e)
+ {
+ throw new WebServiceException("Failed to build METRO runtime model", e);
+ }
+ finally{
+ Thread.currentThread().setContextClassLoader(origClassLoader);
+ }
+
+ }
+
+ private URL getDDUrlFromContext(Deployment deployment)
+ throws MalformedURLException
+ {
+ HashMap<String, String> contextProperties =
+ (HashMap<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
+ URL sunJaxWsXml = new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
+ return sunJaxWsXml;
+ }
+
+ /**
+ * Externalized for integration
+ */
+ protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(
+ ClassLoader classLoader, JBossWSContainer container,
+ ResourceLoader resourceLoader, DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList)
+ throws MalformedURLException
+ {
+ DeploymentDescriptorParserExt<ServletAdapter> parser =
+ new DeploymentDescriptorParserExt<ServletAdapter>(classLoader, resourceLoader, container, adapterList);
+ return parser;
+ }
+
+ /**
+ * Externalized for integration
+ */
+ protected URL getDDUrlFromResourceLoader(UnifiedVirtualFile vfsRoot) throws IOException
+ {
+ URL sunJaxWsXml = vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL();
+ return sunJaxWsXml;
+ }
+
+
+ /**
+ * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}. Pipes
+ * can get ServletContext from Container and use it to load some resources.
+ */
+ static class JBossWSContainer extends Container
+ {
+ private final Module module = new Module()
+ {
+ private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
+
+ public @NotNull
+ List<BoundEndpoint> getBoundEndpoints()
+ {
+ return endpoints;
+ }
+ };
+
+ JBossWSContainer()
+ {
+ }
+
+ public <T> T getSPI(Class<T> spiType)
+ {
+ if (spiType == Module.class)
+ {
+ return spiType.cast(module);
+ }
+ else if(spiType == ResourceInjector.class)
+ {
+ return (T)ResourceInjector.STANDALONE;
+ }
+ else if (spiType == ServerPipelineHook.class)
+ {
+ return (T)new MessageLogPipelineHook();
+ }
+
+ log.warn("Unable to resolve SPI for type: " + spiType);
+ return null;
+ }
+ }
+
+}
Copied: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/VFSResourceLoader.java (from rev 4876, stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/metadata/VFSResourceLoader.java)
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/VFSResourceLoader.java (rev 0)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/VFSResourceLoader.java 2007-10-24 11:05:30 UTC (rev 4880)
@@ -0,0 +1,159 @@
+/*
+ * 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.stack.sunri.metadata;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.logging.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.jar.JarFile;
+import java.util.jar.JarEntry;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class VFSResourceLoader implements ResourceLoader
+{
+
+ private static final Logger log = Logger.getLogger(VFSResourceLoader.class);
+
+ UnifiedVirtualFile vfs;
+
+ public VFSResourceLoader(UnifiedVirtualFile vfs)
+ {
+ this.vfs = vfs;
+ }
+
+ public URL getResource(String path) throws MalformedURLException
+ {
+ try
+ {
+ if(path.startsWith("/"))
+ path = path.substring(1, path.length());
+
+ return vfs.findChild(path).toURL();
+ }
+ catch (IOException e)
+ {
+ throw new MalformedURLException(e.getMessage());
+ }
+ }
+
+ public URL getCatalogFile() throws MalformedURLException
+ {
+ URL resource = null;
+ try
+ {
+ resource = getResource("/WEB-INF/jax-ws-catalog.xml");
+ }
+ catch (MalformedURLException e)
+ {
+ // ingore
+ }
+ return resource;
+ }
+
+ public Set<String> getResourcePaths(String path)
+ {
+ Set<String> resources = new HashSet<String>();
+
+ try
+ {
+ URL rootUrl = getResource(path);
+ if(rootUrl.getProtocol().equals("jar"))
+ {
+ /*String urlString = rootUrl.toExternalForm();
+ String jarRoot = urlString.substring(4, urlString.indexOf("jar!")+3);
+
+ File jar = new File(jarRoot);
+ assert jar.exists();
+ JarFile jarFile = new JarFile(jar);
+
+ List<String> jarResources = getJARResources(jarFile, path);
+
+ resources.addAll(jarResources);*/
+ log.warn("Cannot collect resourcePaths from EJB jar");
+ }
+ else
+ {
+ File root = new File( rootUrl.toURI() );
+ List<String> fileResources = getFileResources(root, path);
+ resources.addAll(fileResources);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to read resource paths from '"+path+"': ", e);
+ }
+
+ return resources;
+ }
+
+ private static List<String> getFileResources(File root, String path)
+ {
+ List<String> resources = new ArrayList<String>();
+
+ if(root.exists())
+ {
+ File[] files = root.listFiles();
+ if (files != null) {
+ for( File f : files) {
+ if(f.isDirectory()) {
+ resources.add(path+f.getName()+'/');
+ } else {
+ resources.add(path+f.getName());
+ }
+ }
+ }
+ }
+ return resources;
+ }
+
+ private static List<String> getJARResources(JarFile jarFile, String path) {
+ List<String> resources = new ArrayList<String>();
+
+ Enumeration entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry entry = (JarEntry) entries.nextElement();
+ String entryName = entry.getName();
+
+ if (entryName.matches(".*?\\.xml$")
+ || entryName.matches(".*?\\.wsdl$")
+ || entryName.matches(".*?\\.xsd$"))
+ {
+ resources.add(entryName);
+ }
+ }
+
+ return resources;
+ }
+}
Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-10-24 11:05:30 UTC (rev 4880)
@@ -57,24 +57,28 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry>
- <entry><key>org.jboss.ws.webapp.ServletContextListener</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry>
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry>
</map>
</property>
</bean>
-
+
+
<bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
</bean>
-
+
<bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">StackDescriptor</property>
</bean>
-
- <!-- Deployment aspect installers -->
+ <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.sunri.metadata.RuntimeModelDeploymentAspect">
+ <property name="requires">RuntimeLoader, StackDescriptor</property>
+ <property name="provides">RuntimeModel</property>
+ </bean>
+ <!-- Deployment aspect installers -->
+
<!-- Phase 1 -->
<bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
@@ -95,6 +99,7 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerPostJSE</depends>
@@ -108,6 +113,7 @@
<inject bean="WSMetroContextPropertiesDeploymentAspect"/>
<inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
<inject bean="WSMetroDescriptorDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerEJB</depends>
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2007-10-24 10:55:20 UTC (rev 4879)
+++ stack/metro/trunk/version.properties 2007-10-24 11:05:30 UTC (rev 4880)
@@ -19,11 +19,13 @@
jbossws-spi=1.0.0.GA
jbossws-jboss42=2.0.1.GA
+junit=3.8.1
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-javaee=5.0.0-SNAPSHOT
jboss-jaxr=1.2.0.GA
jboss-security-spi=2.0.0.Beta
+sun-jaf=1.1
sun-jaxb=2.1.4
sun-jaxrpc=1.1
sun-jaxws=2.1.1
17 years, 3 months
JBossWS SVN: r4879 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-24 06:55:20 -0400 (Wed, 24 Oct 2007)
New Revision: 4879
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Dont exclude jaxrpc/samples because wstools will fail
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 10:55:04 UTC (rev 4878)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-24 10:55:20 UTC (rev 4879)
@@ -84,27 +84,6 @@
org/jboss/test/ws/jaxrpc/marshall-doclit/**
org/jboss/test/ws/jaxrpc/marshall-rpclit/**
org/jboss/test/ws/jaxrpc/overloaded/**
-org/jboss/test/ws/jaxrpc/samples/docstyle/**
-org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
-org/jboss/test/ws/jaxrpc/samples/exception/**
-org/jboss/test/ws/jaxrpc/samples/handler/**
-org/jboss/test/ws/jaxrpc/samples/holder/**
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
-org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**
-org/jboss/test/ws/jaxrpc/samples/jmstransport/**
-org/jboss/test/ws/jaxrpc/samples/message/**
-org/jboss/test/ws/jaxrpc/samples/mtom/**
-org/jboss/test/ws/jaxrpc/samples/oneway/**
-org/jboss/test/ws/jaxrpc/samples/rpcstyle/**
-org/jboss/test/ws/jaxrpc/samples/secureejb/**
-org/jboss/test/ws/jaxrpc/samples/swa/**
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-org/jboss/test/ws/jaxrpc/samples/wssecurity/**
-org/jboss/test/ws/jaxrpc/samples/serviceref/**
-org/jboss/test/ws/jaxrpc/samples/utf16/**
-org/jboss/test/ws/jaxrpc/samples/wsdlpublish/**
-org/jboss/test/ws/jaxrpc/samples/wsse/**
-org/jboss/test/ws/jaxrpc/samples/xop/**
org/jboss/test/ws/jaxws/samples/serviceref/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/samples/wsaddressing/replyto/**
17 years, 3 months