JBossWS SVN: r1236 - in branches/tdiesler/jbossws-1.0: . src/test src/test/resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 07:10:30 -0400 (Tue, 17 Oct 2006)
New Revision: 1236
Modified:
branches/tdiesler/jbossws-1.0/ant.properties.example
branches/tdiesler/jbossws-1.0/src/test/build.xml
branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt
Log:
partial commit
Modified: branches/tdiesler/jbossws-1.0/ant.properties.example
===================================================================
--- branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-17 09:40:13 UTC (rev 1235)
+++ branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-17 11:10:30 UTC (rev 1236)
@@ -12,7 +12,7 @@
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
+#tomcat.home=/usr/java/apache/apache-tomcat-5.5.20
#tomcat.manager.username=manager
#tomcat.manager.password=manager
Modified: branches/tdiesler/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-17 09:40:13 UTC (rev 1235)
+++ branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-17 11:10:30 UTC (rev 1236)
@@ -125,17 +125,25 @@
<!-- Check that the latest build has been deployed -->
<condition property="jbossws.deployed">
- <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
+ <and>
+ <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
+ <equals arg1="${jbossws.target.server}" arg2="jboss"/>
+ </and>
</condition>
- <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/>
+ <condition property="jbossws.deployed">
+ <and>
+ <filesmatch file1="${tomcat.home}/common/lib/jbossws-core.jar" file2="${build.lib.dir}/jbossws-core.jar"/>
+ <equals arg1="${jbossws.target.server}" arg2="tomcat"/>
+ </and>
+ </condition>
+ <fail message="jbossws not deployed, run the deploy target" unless="jbossws.deployed"/>
<!-- Define excluded tests -->
- <property name="jbossws.target.server.${jbossws.target.server}" value="true"/>
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt">
- <isset property="jbossws.target.server.jboss"/>
+ <equals arg1="${jbossws.target.server}" arg2="jboss"/>
</condition>
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-tomcat-excludes.txt">
- <isset property="jbossws.target.server.tomcat"/>
+ <equals arg1="${jbossws.target.server}" arg2="tomcat"/>
</condition>
<!-- The jbossws client classpath -->
@@ -173,13 +181,14 @@
<pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
<pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
- <pathelement location="${jboss.lib}/jboss-system.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-system.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss.jar"/>
+ <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/>
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
</path>
<!-- Check that jBPM BPEL has been deployed -->
Modified: branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-17 09:40:13 UTC (rev 1235)
+++ branches/tdiesler/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-17 11:10:30 UTC (rev 1236)
@@ -1,6 +1,7 @@
-org/jboss/test/ws/samples/dynamichandler/**
-org/jboss/test/ws/samples/jmstransport/**
-org/jboss/test/ws/samples/jsr109ejb/**
-org/jboss/test/ws/samples/jsr181ejb/**
-org/jboss/test/ws/samples/secureejb/**
-org/jboss/test/ws/jbws1011/**
+org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
+org/jboss/test/ws/jaxrpc/samples/jmstransport/**
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
+org/jboss/test/ws/jaxrpc/samples/secureejb/**
+org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+org/jboss/test/ws/jaxrpc/jbws1011/**
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**
17 years, 7 months
JBossWS SVN: r1235 - branches/tdiesler
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 05:40:13 -0400 (Tue, 17 Oct 2006)
New Revision: 1235
Added:
branches/tdiesler/jbossws-1.0/
Log:
recreate tdiesler/jbossws-1.0
Copied: branches/tdiesler/jbossws-1.0 (from rev 1234, branches/jbossws-1.0)
17 years, 7 months
JBossWS SVN: r1234 - branches/tdiesler
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 05:39:54 -0400 (Tue, 17 Oct 2006)
New Revision: 1234
Removed:
branches/tdiesler/jbossws-1.0/
Log:
recreate tdiesler/jbossws-1.0
17 years, 7 months
JBossWS SVN: r1233 - in trunk/src/main/java/org/jboss/ws/metadata: . wsdl
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-10-16 23:12:40 -0400 (Mon, 16 Oct 2006)
New Revision: 1233
Modified:
trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
Log:
Fix document/literal bare assertion
Allow null elements in WSDLInterfaceOperation
Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-17 03:11:31 UTC (rev 1232)
+++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-17 03:12:40 UTC (rev 1233)
@@ -486,8 +486,8 @@
if (returnParam != null && !returnParam.isInHeader())
out++;
- if (!((oneWay && in == 1 && out == 0) || (in == 1 && out == 1)))
- throw new WSException("The body of a documnet/literal bare message requires only 1 input and only 1 output (or 0 if oneway). method: " + javaName + " in: "
+ if (in > 1 || out > (oneWay ? 0 : 1))
+ throw new WSException("The body of a documnet/literal bare message requires at most 1 input and at most 1 output (or 0 if oneway). method: " + javaName + " in: "
+ in + " out: " + out);
}
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-17 03:11:31 UTC (rev 1232)
+++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-17 03:12:40 UTC (rev 1233)
@@ -184,8 +184,6 @@
public void addOutput(WSDLInterfaceOperationOutput output)
{
QName xmlName = output.getElement();
- if (xmlName == null)
- throw new IllegalArgumentException("Illegal null element name");
if (outputs.get(xmlName) != null)
throw new WSException("Attempt to map multiple operation outputs to: " + xmlName);
outputs.put(xmlName, output);
17 years, 7 months
JBossWS SVN: r1232 - in trunk/src/test/resources/jaxrpc/jbws1125: . WEB-INF WEB-INF/wsdl
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-10-16 23:11:31 -0400 (Mon, 16 Oct 2006)
New Revision: 1232
Modified:
trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml
Log:
Correct test case
Modified: trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-10-16 21:51:49 UTC (rev 1231)
+++ trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-10-17 03:11:31 UTC (rev 1232)
@@ -3,34 +3,6 @@
<package-type>org.jboss.test.ws.jaxrpc.jbws1125</package-type>
<namespaceURI>http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types</namespaceURI>
</package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noParamPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'>typeNS:noParamPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noParamPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'>typeNS:noParamPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noReturnPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'>typeNS:noReturnPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>string_1</java-variable-name>
- <xml-element-name>String_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noReturnPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'>typeNS:noReturnPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
<service-interface-mapping>
<service-interface>org.jboss.test.ws.jaxrpc.jbws1125.TestService</service-interface>
<wsdl-service-name xmlns:serviceNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'>serviceNS:TestService</wsdl-service-name>
@@ -46,23 +18,21 @@
<service-endpoint-method-mapping>
<java-method-name>noParamPart</java-method-name>
<wsdl-operation>noParamPart</wsdl-operation>
- <wrapped-element/>
<wsdl-return-value-mapping>
<method-return-value>java.lang.String</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noParamPartResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
+ <wsdl-message-part-name>noParamPartResponse</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
<service-endpoint-method-mapping>
<java-method-name>noReturnPart</java-method-name>
<wsdl-operation>noReturnPart</wsdl-operation>
- <wrapped-element/>
<method-param-parts-mapping>
<param-position>0</param-position>
<param-type>java.lang.String</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noReturnPart</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <wsdl-message-part-name>noReturnPart</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
Modified: trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-10-16 21:51:49 UTC (rev 1231)
+++ trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-10-17 03:11:31 UTC (rev 1232)
@@ -2,54 +2,24 @@
<definitions name='TestService' targetNamespace='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types>
<schema targetNamespace='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='noParamPart'>
- <sequence/>
- </complexType>
- <complexType name='noParamPartResponse'>
- <sequence>
- <element name='result' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPart'>
- <sequence>
- <element name='String_1' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPartResponse'>
- <sequence/>
- </complexType>
- <element name='noParamPart' type='tns:noParamPart'/>
- <element name='noParamPartResponse' type='tns:noParamPartResponse'/>
- <element name='noReturnPart' type='tns:noReturnPart'/>
- <element name='noReturnPartResponse' type='tns:noReturnPartResponse'/>
+ <element name='noParamPartResponse' type='string'/>
+ <element name='noReturnPart' type='string'/>
</schema>
</types>
-
- <!--
- BP-1.0 5.3.1 Bindings and Parts
- Use of wsdl:message elements with zero parts is permitted in Document styles to permit operations
- that can send or receive messages with empty soap:Bodys.
- -->
- <message name='TestEndpoint_noParamPart'>
- <!-- part element='ns1:noParamPart' name='parameters'/ -->
- </message>
+ <message name='TestEndpoint_noParamPart'/>
<message name='TestEndpoint_noParamPartResponse'>
- <part element='ns1:noParamPartResponse' name='result'/>
+ <part element='ns1:noParamPartResponse' name='noParamPartResponse'/>
</message>
-
<message name='TestEndpoint_noReturnPart'>
- <part element='ns1:noReturnPart' name='parameters'/>
+ <part element='ns1:noReturnPart' name='noReturnPart'/>
</message>
- <message name='TestEndpoint_noReturnPartResponse'>
- <!-- part element='ns1:noReturnPartResponse' name='result'/ -->
- </message>
-
+ <message name='TestEndpoint_noReturnPartResponse'/>
<portType name='TestEndpoint'>
<operation name='noParamPart'>
<input message='tns:TestEndpoint_noParamPart'/>
<output message='tns:TestEndpoint_noParamPartResponse'/>
</operation>
- <operation name='noReturnPart'>
+ <operation name='noReturnPart' parameterOrder='noReturnPart'>
<input message='tns:TestEndpoint_noReturnPart'/>
<output message='tns:TestEndpoint_noReturnPartResponse'/>
</operation>
@@ -80,4 +50,4 @@
<soap:address location='REPLACE_WITH_ACTUAL_URL'/>
</port>
</service>
-</definitions>
\ No newline at end of file
+</definitions>
Modified: trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml 2006-10-16 21:51:49 UTC (rev 1231)
+++ trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml 2006-10-17 03:11:31 UTC (rev 1232)
@@ -7,7 +7,7 @@
<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
<java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint" style="document">
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint" style="document" parameter-style="bare">
</service>
<namespaces target-namespace="http://jbws1125.jaxrpc.ws.test.jboss.org/jaws" type-namespace="http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types"/>
<mapping file="jaxrpc-mapping.xml"/>
17 years, 7 months
JBossWS SVN: r1231 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/integration/tomcat src/main/resources/jbossws.war/Tomcat/META-INF src/main/resources/jbossws.war/Tomcat/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-16 17:51:49 -0400 (Mon, 16 Oct 2006)
New Revision: 1231
Modified:
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml
Log:
JBWS-1305 - Fix deployment to Tomcat.
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/build.xml 2006-10-16 21:51:49 UTC (rev 1231)
@@ -537,6 +537,9 @@
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/>
<copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-10-16 21:51:49 UTC (rev 1231)
@@ -67,7 +67,8 @@
deployServiceEndpoints(getServletContext());
}
catch (Exception e)
- {
+ {
+ log.error("Unable to init servlet", e);
Thread.currentThread().setContextClassLoader(ctxLoader);
}
}
Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml 2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml 2006-10-16 21:51:49 UTC (rev 1231)
@@ -23,9 +23,9 @@
<property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property>
</bean>
- <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.other.GenericServiceEndpointPublisher">
+ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.tomcat.TomcatServiceEndpointPublisher">
<property name="serviceEndpointDeployer"><inject bean="ServiceEndpointDeployer"/></property>
- <property name="serviceEndpointServlet">org.jboss.ws.integration.other.GenericServiceEndpointServlet</property>
+ <property name="serviceEndpointServlet">org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet</property>
<property name="deployDir">${catalina.home}/jbossws-deploy</property>
<property name="targetDir">${catalina.home}/webapps</property>
<property name="interval">500</property>
@@ -36,7 +36,7 @@
-->
<bean name="SubscriptionManager" class="org.jboss.ws.eventing.mgmt.SubscriptionManager"/>
- <bean name="ServerConfig" class="org.jboss.ws.integration.other.ServerConfigImpl"/>
+ <bean name="ServerConfig" class="org.jboss.ws.integration.tomcat.ServerConfigImpl"/>
<bean name="KernelLocator" class="org.jboss.ws.server.KernelLocator"/>
Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml 2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml 2006-10-16 21:51:49 UTC (rev 1231)
@@ -13,7 +13,7 @@
<servlet>
<servlet-name>ContextServlet</servlet-name>
- <servlet-class>org.jboss.ws.integration.other.ContextServlet</servlet-class>
+ <servlet-class>org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
17 years, 7 months
JBossWS SVN: r1230 - in branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws: deployment integration/jboss
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-16 11:33:10 -0400 (Mon, 16 Oct 2006)
New Revision: 1230
Modified:
branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java
Log:
JBWS-1133 - Prototype code.
Modified: branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
===================================================================
--- branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-10-16 15:32:34 UTC (rev 1229)
+++ branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java 2006-10-16 15:33:10 UTC (rev 1230)
@@ -97,6 +97,8 @@
if (webXML.isFile() == false)
throw new WSException("Cannot find web.xml: " + webXML);
+ File newWebXML = new File(warURL.getFile() + "/WEB-INF/web.xml.jbossws");
+
try
{
Element root = DOMUtils.parse(new FileInputStream(webXML));
@@ -105,14 +107,16 @@
Map<String, String> sepTargetMap = modifyServletConfig(root, warName);
// After redeployment there might be a stale copy of the original web.xml.org, we delete it
- File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
- orgWebXML.delete();
-
+ /*File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ orgWebXML.delete();*/
+ newWebXML.delete();
+
// Rename the web.xml
- if (webXML.renameTo(orgWebXML) == false)
- throw new WSException("Cannot rename web.xml: " + orgWebXML);
+ /*if (webXML.renameTo(orgWebXML) == false)
+ throw new WSException("Cannot rename web.xml: " + orgWebXML);*/
- FileOutputStream fos = new FileOutputStream(webXML);
+ log.info("New Web XML " + newWebXML.getAbsolutePath());
+ FileOutputStream fos = new FileOutputStream(newWebXML);
new DOMWriter(fos).setPrettyprint(true).print(root);
fos.close();
Modified: branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java
===================================================================
--- branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java 2006-10-16 15:32:34 UTC (rev 1229)
+++ branches/dlofthouse/JBWS-1133/src/main/java/org/jboss/ws/integration/jboss/DeployerInterceptorJSE.java 2006-10-16 15:33:10 UTC (rev 1230)
@@ -23,6 +23,7 @@
// $Id: WebServiceDeployerJSE.java 377 2006-05-18 13:57:29Z thomas.diesler(a)jboss.com $
+import java.io.File;
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
@@ -87,6 +88,10 @@
{
ServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
Map<String, String> sepTargetMap = endpointPublisher.rewriteWebXML(udi.localUrl);
+
+ File newWebXML = new File(udi.localUrl.getFile() + "/WEB-INF/web.xml.jbossws");
+ ((WebMetaData)di.metaData).setAltDD(newWebXML.getAbsolutePath());
+
updateServiceEndpointTargetBeans(udi, sepTargetMap);
}
return retn;
17 years, 7 months
JBossWS SVN: r1229 - in branches/dlofthouse/JBWS-1133/src/test: ant java/org/jboss/test/ws/jaxws java/org/jboss/test/ws/jaxws/jbws1133 resources/jaxws resources/jaxws/jbws1133 resources/jaxws/jbws1133/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-16 11:32:34 -0400 (Mon, 16 Oct 2006)
New Revision: 1229
Added:
branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/
branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java
branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java
branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/
branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/
branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml
Modified:
branches/dlofthouse/JBWS-1133/src/test/ant/build-jars-jaxws.xml
Log:
JBWS-1133 - Test Case
Modified: branches/dlofthouse/JBWS-1133/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/dlofthouse/JBWS-1133/src/test/ant/build-jars-jaxws.xml 2006-10-16 15:30:38 UTC (rev 1228)
+++ branches/dlofthouse/JBWS-1133/src/test/ant/build-jars-jaxws.xml 2006-10-16 15:32:34 UTC (rev 1229)
@@ -74,6 +74,18 @@
<include name="org/jboss/test/ws/jaxws/jbws1123/MessageBean.class"/>
</classes>
</war>
+
+ <!-- jaxws-jbws1133 -->
+ <mkdir dir="${build.test.dir}/libs/jaxws-jbws1133.war"/>
+ <mkdir dir="${build.test.dir}/libs/jaxws-jbws1133.war/WEB-INF"/>
+ <mkdir dir="${build.test.dir}/libs/jaxws-jbws1133.war/WEB-INF/classes"/>
+ <copy tofile="${build.test.dir}/libs/jaxws-jbws1133.war/WEB-INF/original-web.xml"
+ file="${build.test.dir}/resources/jaxws/jbws1133/WEB-INF/web.xml"/>
+ <copy todir="${build.test.dir}/libs/jaxws-jbws1133.war/WEB-INF/classes">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.class"/>
+ </fileset>
+ </copy>
<!-- jaxws-jbws1178 -->
<war destfile="${build.test.dir}/libs/jaxws-jbws1178.war" webxml="${build.test.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
Added: branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java 2006-10-16 15:30:38 UTC (rev 1228)
+++ branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java 2006-10-16 15:32:34 UTC (rev 1229)
@@ -0,0 +1,80 @@
+/*
+ * 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.jbws1133;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.apache.tools.ant.util.FileUtils;
+import org.jboss.test.ws.JBossWSTest;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 16-October-2006
+ */
+public class JBWS1133TestCase extends JBossWSTest
+{
+
+ private final String TARGET_WSDL = "http://" + getServerHost() + ":8080/jaxws-jbws1133?wsdl";
+
+ public void testRedeployExploded() throws Exception
+ {
+ cleanWebXML();
+
+ try
+ {
+ deploy("jaxws-jbws1133.war");
+
+ checkWSDL();
+
+ undeploy("jaxws-jbws1133.war");
+ deploy("jaxws-jbws1133.war");
+
+ checkWSDL();
+ }
+ finally
+ {
+ undeploy("jaxws-jbws1133.war");
+ }
+ }
+
+ private void cleanWebXML() throws Exception
+ {
+ File webXML = new File("libs/jaxws-jbws1133.war/WEB-INF/web.xml");
+ if (webXML.exists())
+ {
+ webXML.delete();
+ }
+ File originalWebXML = new File("libs/jaxws-jbws1133.war/WEB-INF/original-web.xml");
+ FileUtils.getFileUtils().copyFile(originalWebXML, webXML);
+ }
+
+ private void checkWSDL() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_WSDL);
+ InputStream is = wsdlURL.openStream();
+ assertNotNull(is);
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/JBWS1133TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java 2006-10-16 15:30:38 UTC (rev 1228)
+++ branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java 2006-10-16 15:32:34 UTC (rev 1229)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1133;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 16-October-2006
+ */
+@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1133")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public class TestEndpoint
+{
+
+ @WebMethod
+ public String echo(final String message)
+ {
+ return message;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1133/src/test/java/org/jboss/test/ws/jaxws/jbws1133/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml
===================================================================
--- branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml 2006-10-16 15:30:38 UTC (rev 1228)
+++ branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml 2006-10-16 15:32:34 UTC (rev 1229)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1133.TestEndpoint</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1133/src/test/resources/jaxws/jbws1133/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 7 months
JBossWS SVN: r1228 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-16 11:30:38 -0400 (Mon, 16 Oct 2006)
New Revision: 1228
Added:
branches/dlofthouse/JBWS-1133/
Log:
Branch for JBWS-1133
Copied: branches/dlofthouse/JBWS-1133 (from rev 1227, branches/jbossws-1.0)
17 years, 7 months
JBossWS SVN: r1227 - branches
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-10-16 11:28:24 -0400 (Mon, 16 Oct 2006)
New Revision: 1227
Added:
branches/dlofthouse/
Log:
Working folder for tasks I am currently working on.
17 years, 7 months