JBossWS SVN: r1722 - trunk/integration-jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 03:47:42 -0500 (Fri, 22 Dec 2006)
New Revision: 1722
Modified:
trunk/integration-jboss50/
Log:
ignore output-eclipse
Property changes on: trunk/integration-jboss50
___________________________________________________________________
Name: svn:ignore
+
output-eclipse
18 years, 2 months
JBossWS SVN: r1721 - trunk/jbossws
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 03:47:38 -0500 (Fri, 22 Dec 2006)
New Revision: 1721
Modified:
trunk/jbossws/
Log:
ignore output-eclipse
Property changes on: trunk/jbossws
___________________________________________________________________
Name: svn:ignore
+
output-eclipse
18 years, 2 months
JBossWS SVN: r1720 - trunk/integration-jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 03:47:34 -0500 (Fri, 22 Dec 2006)
New Revision: 1720
Modified:
trunk/integration-jboss42/
Log:
ignore output-eclipse
Property changes on: trunk/integration-jboss42
___________________________________________________________________
Name: svn:ignore
+
output-eclipse
18 years, 2 months
JBossWS SVN: r1719 - trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 03:47:30 -0500 (Fri, 22 Dec 2006)
New Revision: 1719
Modified:
trunk/integration-tomcat/
Log:
ignore output-eclipse
Property changes on: trunk/integration-tomcat
___________________________________________________________________
Name: svn:ignore
+
output-eclipse
18 years, 2 months
JBossWS SVN: r1717 - in branches/dlofthouse/JBWS-1260/src: main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/tools/jbws1260 test/resources/tools/jbws1260 test/resources/tools/jbws1260/scenario_AG
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-21 20:54:35 -0500 (Thu, 21 Dec 2006)
New Revision: 1717
Added:
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml
branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
Log:
JBWS-1260 - Throw exceptions for not supported unwrapping.
Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -253,12 +253,8 @@
if (j > 0)
buf.append(",");
WSDLInterfaceOperationInput in = ins[j];
- QName xmlName = in.getElement();
- QName xmlType = in.getXMLType();
- JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
- XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
- appendParameters(buf, in, in.getElement().getLocalPart(), xmlType, xt);
+ appendParameters(buf, in, in.getElement().getLocalPart());
}
//Check for out holder only
@@ -394,7 +390,12 @@
StringBuilder tempBuf = new StringBuilder();
XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
- boolean appendedAttribute = appendParameters(tempBuf, wrapper.getAttributeUses());
+ boolean hasAttributes = wrapper.getAttributeUses().getLength() > 0;
+
+ if (hasAttributes)
+ throw new WSException("Can not unwrap, complex type contains attributes.");
+ // TODO DAL - Add same check for unwrapping response.
+
boolean unwrappedElement = false;
XSParticle particle = wrapper.getParticle();
@@ -411,7 +412,7 @@
}
}
- if ((appendedAttribute && unwrappedElement) || unwrappedElement)
+ if (unwrappedElement)
{
buf.append(tempBuf);
@@ -424,41 +425,28 @@
return false;
}
- private boolean appendParameters(StringBuilder buf, XSObjectList attributes) throws IOException
+ private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, String containingElement) throws IOException
{
- JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
- boolean appendedParameter = false;
- for (int i = 0; i < attributes.getLength(); i++)
- {
- XSObject object = attributes.item(i);
- if (object instanceof XSAttributeUse)
- {
- if (buf.length() > 0)
- buf.append(", ");
-
- XSAttributeUse attribute = (XSAttributeUse)object;
- XSAttributeDeclaration declaration = attribute.getAttrDeclaration();
- XSTypeDefinition type = declaration.getTypeDefinition();
- QName xmlType = new QName(type.getNamespace(), type.getName());
- generateParameter(buf, null, "", xmlType, xsmodel, type, false, true);
- buf.append(" ").append(getMethodParam(declaration.getName()));
-
- appendedParameter = true;
- }
- }
-
- return appendedParameter;
- }
-
- private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, String containingElement, QName xmlType, XSTypeDefinition xt) throws IOException
- {
+ QName xmlType = in.getXMLType();
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
+ XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
boolean wrapped = isWrapped();
if (wrapped)
{
+ int inputs = in.getWsdlOperation().getInputs().length;
+ if (inputs > 1)
+ throw new WSException("Can not unwrap parameters for operation with mutliple inputs. inputs=" + inputs);
+
+ String operationName = in.getWsdlOperation().getName().toString();
+ String elementName = in.getElement().getLocalPart();
+
+ if (elementName.equals(operationName) == false)
+ throw new WSException("Unable to unwrap parameters, wrapper element name must match operation name. operationName=" + operationName + " elementName="
+ + elementName);
+
wrapped = unwrapElementParameters(buf, containingElement, xt);
}
@@ -582,7 +570,7 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
- ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped());
+ ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(outs, xsmodel, isWrapped());
if (unwrapper.unwrap())
{
// Need to generate wrapper class as well.
Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -246,7 +246,7 @@
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
- ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped());
+ ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(wiopoutarr, schemaModel, isWrapped());
if (unwrapper.unwrap())
{
if (unwrapper.unwrappedElement != null)
Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -34,6 +34,9 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
/**
* A helper class to unwrap a return type is possible.
@@ -44,16 +47,18 @@
public class ReturnTypeUnwrapper
{
- public XSTypeDefinition xt;
+ public WSDLInterfaceOperationOutput[] outputs;
+ public JBossXSModel xsmodel;
public QName xmlType;
public XSAttributeDeclaration unwrappedAttribute;
public XSElementDeclaration unwrappedElement;
public boolean array = false;
private boolean wrapped;
- public ReturnTypeUnwrapper(XSTypeDefinition xt, boolean wrapped)
+ public ReturnTypeUnwrapper(WSDLInterfaceOperationOutput[] outputs, JBossXSModel xsmodel, boolean wrapped)
{
- this.xt = xt;
+ this.outputs = outputs;
+ this.xsmodel = xsmodel;
this.wrapped = wrapped;
}
@@ -62,6 +67,14 @@
if (wrapped == false)
return false;
+ if (outputs.length > 1)
+ throw new WSException("Can not unwrap parameters for operation with mutliple outputs. outputs=" + outputs.length);
+
+ WSDLInterfaceOperationOutput out = outputs[0];
+ QName xmlType = out.getXMLType();
+
+ XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
+
if (xt instanceof XSComplexTypeDefinition == false)
throw new WSException("Tried to unwrap a non-complex type.");
@@ -108,7 +121,7 @@
XSTypeDefinition type = unwrappedElement.getTypeDefinition();
if (type.getAnonymous() == false)
xmlType = new QName(unwrappedElement.getTypeDefinition().getNamespace(), unwrappedElement.getTypeDefinition().getName());
-
+
this.array = array;
}
Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -817,6 +817,31 @@
generateScenario("AF");
}
+ /**
+ * Test scenario where unwrapping should not occur as the element for the request
+ * message does not match the name of the operation.
+ *
+ * <operation name='lookup'>
+ * <input message='tns:PhoneBook_lookup'/>
+ * <output message='tns:PhoneBook_lookupResponse'/>
+ * </operation>
+ *
+ * <message name='PhoneBook_lookup'>
+ * <part element='ns1:lookupPerson' name='parameters'/>
+ * </message>
+ */
+ public void testScenario_AG() throws Exception
+ {
+ try
+ {
+ generateScenario("AG");
+ fail("Expected exception not thrown.");
+ }
+ catch (WSException e)
+ {
+ }
+ }
+
protected void generateScenario(final String scenario) throws Exception
{
String tests = System.getProperty("client.scenario");
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,26 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+
+public class Person {
+ protected java.lang.String surname;
+
+ public Person() {
+ }
+
+ public Person(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,26 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1260;
+
+
+public class TelephoneNumber {
+ protected java.lang.String number;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String number) {
+ this.number = number;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookupPerson' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookupPerson' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1260</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1260.Person</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1260.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2006-12-22 00:07:33 UTC (rev 1716)
+++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2006-12-22 01:54:35 UTC (rev 1717)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1260/scenario_AG/Wrapped.wsdl" parameter-style="wrapped">
+ <mapping file="wrapped-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 2 months
JBossWS SVN: r1716 - in branches/tdiesler/trunk/build: . etc import
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 19:07:33 -0500 (Thu, 21 Dec 2006)
New Revision: 1716
Added:
branches/tdiesler/trunk/build/etc/
branches/tdiesler/trunk/build/etc/JBossORG-EULA.txt
branches/tdiesler/trunk/build/etc/default.mf
branches/tdiesler/trunk/build/etc/jbossws-component-info.xml
branches/tdiesler/trunk/build/etc/wspublish.sh
branches/tdiesler/trunk/build/etc/wstools.bat
branches/tdiesler/trunk/build/etc/wstools.sh
Modified:
branches/tdiesler/trunk/build/build.xml
branches/tdiesler/trunk/build/import/build-release.xml
branches/tdiesler/trunk/build/version.properties
Log:
partial commit
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/build.xml 2006-12-22 00:07:33 UTC (rev 1716)
@@ -33,10 +33,9 @@
<property name="build.samples.dir" value="${build.dir}/samples"/>
<property name="build.bin.dist" value="${build.dir}/bin-dist"/>
<property name="build.src.dist" value="${build.dir}/src-dist"/>
- <property name="build.api" value="${build.dir}/api"/>
+ <property name="build.api-docs" value="${build.dir}/api-docs"/>
<property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
<property name="jbossws.src.dir" value="${basedir}/../jbossws/src/main"/>
- <property name="jbossws.etc.dir" value="${jbossws.src.dir}/etc"/>
<property name="jbossws.java.dir" value="${jbossws.src.dir}/java"/>
<property name="jbossws.resources.dir" value="${jbossws.src.dir}/resources"/>
<property name="test.dir" value="${basedir}/src/test"/>
@@ -196,7 +195,7 @@
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc.dir}"/>
<copy todir="${build.etc.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${jbossws.etc.dir}"/>
+ <fileset dir="${basedir}/etc"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -424,8 +423,8 @@
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
- <mkdir dir="${build.api}"/>
- <javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <mkdir dir="${build.api-docs}"/>
+ <javadoc destdir="${build.api-docs}" author="true" version="true" use="true" windowtitle="JBossWS API">
<packageset dir="${jbossws.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
</packageset>
Added: branches/tdiesler/trunk/build/etc/JBossORG-EULA.txt
===================================================================
--- branches/tdiesler/trunk/build/etc/JBossORG-EULA.txt 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/JBossORG-EULA.txt 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Property changes on: branches/tdiesler/trunk/build/etc/JBossORG-EULA.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/build/etc/default.mf
===================================================================
--- branches/tdiesler/trunk/build/etc/default.mf 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/default.mf 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (date=(a)build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Added: branches/tdiesler/trunk/build/etc/jbossws-component-info.xml
===================================================================
--- branches/tdiesler/trunk/build/etc/jbossws-component-info.xml 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/jbossws-component-info.xml 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,45 @@
+<project name="jboss/jbossws-component-info">
+
+ <component id="jboss/jbossws"
+ licenseType="lgpl"
+ version="@repository.id@"
+ description="JBossWS an implementation of J2EE Web Services">
+
+ <artifact id="jbossws50.sar"/>
+ <artifact id="jbossws50.deployer"/>
+ <artifact id="jbossws42.sar"/>
+ <artifact id="jbossws-client.jar"/>
+ <artifact id="jboss-jaxrpc.jar"/>
+ <artifact id="jboss-jaxws.jar"/>
+ <artifact id="jboss-saaj.jar"/>
+
+ <import componentref="apache-xmlsec">
+ <compatible version="@apache-xmlsec@"/>
+ </import>
+ <import componentref="javassist">
+ <compatible version="@javassist@"/>
+ </import>
+ <import componentref="ibm-wsdl4j">
+ <compatible version="@ibm-wsdl4j@"/>
+ </import>
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb@"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="1.4.5.GA"/>
+ <compatible version="@jboss-remoting@"/>
+ </import>
+ <import componentref="sun-jaxb">
+ <compatible version="@sun-jaxb@"/>
+ </import>
+
+ <export>
+ <include input="jbossws-client.jar"/>
+ <include input="jboss-jaxrpc.jar"/>
+ <include input="jboss-jaxws.jar"/>
+ <include input="jboss-saaj.jar"/>
+ </export>
+
+ </component>
+
+</project>
Property changes on: branches/tdiesler/trunk/build/etc/jbossws-component-info.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/build/etc/wspublish.sh
===================================================================
--- branches/tdiesler/trunk/build/etc/wspublish.sh 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/wspublish.sh 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# $Id: WSPUBLISH.sh 214 2006-04-20 17:43:45Z thomas.diesler(a)jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$TOMCAT_HOME" ] &&
+ TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+export TOMCAT_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the WSPUBLISH classpath
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar"
+WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"`
+fi
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo " WSPUBLISH Environment"
+echo ""
+echo " TOMCAT_HOME: $TOMCAT_HOME"
+echo ""
+echo " JAVA: $JAVA"
+echo ""
+echo " JAVA_OPTS: $JAVA_OPTS"
+echo ""
+#echo " CLASSPATH: $WSPUBLISH_CLASSPATH"
+#echo ""
+echo "========================================================================="
+echo ""
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+ -classpath "$WSPUBLISH_CLASSPATH" \
+ org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@"
+
Added: branches/tdiesler/trunk/build/etc/wstools.bat
===================================================================
--- branches/tdiesler/trunk/build/etc/wstools.bat 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/wstools.bat 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,62 @@
+@echo off
+
+rem $Id: wstools.bat 1683 2006-12-21 12:40:22Z thomas.diesler(a)jboss.com $
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM set ARGS=%ARGS% %1
+REM shift
+REM goto loop
+REM :endloop
+
+set JAVA=%JAVA_HOME%\bin\java
+set JBOSS_HOME=%DIRNAME%\..
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the wstools classpath
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+
+rem Display our environment
+echo ========================================================================="
+echo .
+echo WSTools Environment
+echo .
+echo JBOSS_HOME: %JBOSS_HOME%
+echo .
+echo JAVA: %JAVA%
+echo .
+echo JAVA_OPTS: %JAVA_OPTS%
+echo .
+rem echo CLASSPATH: %WSTOOLS_CLASSPATH%
+rem echo .
+echo ========================================================================="
+echo .
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %*
+
Added: branches/tdiesler/trunk/build/etc/wstools.sh
===================================================================
--- branches/tdiesler/trunk/build/etc/wstools.sh 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/etc/wstools.sh 2006-12-22 00:07:33 UTC (rev 1716)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# $Id: wstools.sh 1683 2006-12-21 12:40:22Z thomas.diesler(a)jboss.com $
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JBOSS_HOME" ] &&
+ JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="$JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Setup the wstools classpath
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"`
+ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo " WSTools Environment"
+echo ""
+echo " JBOSS_HOME: $JBOSS_HOME"
+echo ""
+echo " JAVA: $JAVA"
+echo ""
+echo " JAVA_OPTS: $JAVA_OPTS"
+echo ""
+#echo " CLASSPATH: $WSTOOLS_CLASSPATH"
+#echo ""
+echo "========================================================================="
+echo ""
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+ -Dlog4j.configuration=wstools-log4j.xml \
+ -classpath "$WSTOOLS_CLASSPATH" \
+ org.jboss.ws.tools.WSTools "$@"
Modified: branches/tdiesler/trunk/build/import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/build/import/build-release.xml 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/import/build-release.xml 2006-12-22 00:07:33 UTC (rev 1716)
@@ -35,24 +35,26 @@
</target>
<!-- Release to jboss.local.repository -->
- <target name="release-to-repository" depends="module-jars" description="Release to jboss.local.repository">
+ <target name="release-to-repository" depends="jars" description="Release to jboss.local.repository">
<!-- jbossws -->
<property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
<mkdir dir="${jbossws.dir}/lib"/>
<copy todir="${jbossws.dir}/lib" overwrite="true">
<fileset dir="${build.lib.dir}">
- <include name="jbossws.sar"/>
- <include name="jbossws.deployer"/>
+ <include name="jbossws50.sar"/>
+ <include name="jbossws50.deployer"/>
+ <include name="jbossws42.sar"/>
<include name="jbossws-client.jar"/>
- <include name="jbossws-jboss-integration.jar"/>
+ <include name="jbossws-jboss50-integration.jar"/>
+ <include name="jbossws-jboss42-integration.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
- <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jbossws.dir}/component-info.xml" file="${build.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="version.properties"/>
</filterset>
@@ -109,7 +111,7 @@
<mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/>
<mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/>
- <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
+ <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
<copy todir="${build.bin.dist}" filtering="true" overwrite="true">
<fileset dir="${src.dist.dir}"/>
<filterset>
@@ -117,7 +119,7 @@
</filterset>
</copy>
<copy todir="${build.bin.dist}/bin">
- <fileset dir="${src.etc.dir}">
+ <fileset dir="${build.etc.dir}">
<include name="wstools.bat"/>
<include name="wstools.sh"/>
</fileset>
Modified: branches/tdiesler/trunk/build/version.properties
===================================================================
--- branches/tdiesler/trunk/build/version.properties 2006-12-22 00:07:29 UTC (rev 1715)
+++ branches/tdiesler/trunk/build/version.properties 2006-12-22 00:07:33 UTC (rev 1716)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.0.CR3.DEV
-repository.id=snapshot
+version.id=1.2.0.CR1
+repository.id=1.2.0.CR1
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
@@ -19,9 +19,9 @@
javassist=3.4.GA
jboss-common-core=2.0.2.CR1
jboss-common-logging=2.0.1.GA
-jboss-jbossxb=1.0.0.CR7
+jboss-jbossxb=snapshot
jboss-microcontainer=snapshot
-jboss-remoting=2.2.0.Alpha2
+jboss-remoting=2.0.0.GA
# thirdparty library versions
apache-ant=1.6.5
18 years, 2 months
JBossWS SVN: r1715 - branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 19:07:29 -0500 (Thu, 21 Dec 2006)
New Revision: 1715
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java 2006-12-22 00:07:25 UTC (rev 1714)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java 2006-12-22 00:07:29 UTC (rev 1715)
@@ -47,7 +47,7 @@
if (udi != null)
{
UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
- udi.expandedWebApp = generateWebDeployment(di, wsMetaData);
+ udi.webappURL = generateWebDeployment(di, wsMetaData);
udi.context.put(DeploymentInfo.class.getName(), di);
getServiceEndpointPublisher().publishServiceEndpoint(udi);
}
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-22 00:07:25 UTC (rev 1714)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-22 00:07:29 UTC (rev 1715)
@@ -65,7 +65,7 @@
public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
{
- getMainDeployer().undeploy(udi.expandedWebApp);
+ getMainDeployer().undeploy(udi.webappURL);
return "OK";
}
18 years, 2 months
JBossWS SVN: r1714 - branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 19:07:25 -0500 (Thu, 21 Dec 2006)
New Revision: 1714
Modified:
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-22 00:07:12 UTC (rev 1713)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-22 00:07:25 UTC (rev 1714)
@@ -63,7 +63,7 @@
public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
{
- URL warURL = udi.expandedWebApp;
+ URL warURL = udi.webappURL;
log.debug("publishServiceEndpoint: " + warURL);
rewriteWebXml(warURL);
@@ -78,7 +78,7 @@
public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
{
- URL warURL = udi.expandedWebApp;
+ URL warURL = udi.webappURL;
log.debug("destroyServiceEndpoint: " + warURL);
DeploymentContext context = contextMap.get(warURL.toExternalForm());
18 years, 2 months
JBossWS SVN: r1713 - in branches/tdiesler/trunk/jbossws: . src/main src/main/java/org/jboss/ws/core/server src/main/java/org/jboss/ws/core/soap src/test src/test/java/org/jboss/test/ws/jaxws/webserviceref src/test/resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 19:07:12 -0500 (Thu, 21 Dec 2006)
New Revision: 1713
Added:
branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt
Removed:
branches/tdiesler/trunk/jbossws/src/main/etc/
branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt
Modified:
branches/tdiesler/trunk/jbossws/.classpath
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
branches/tdiesler/trunk/jbossws/src/test/build.xml
branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
Log:
partial commit
Modified: branches/tdiesler/trunk/jbossws/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws/.classpath 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/.classpath 2006-12-22 00:07:12 UTC (rev 1713)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java
===================================================================
--- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-22 00:07:12 UTC (rev 1713)
@@ -61,7 +61,7 @@
/** The string identifing this deployment **/
public String name;
/** The URL to the expanded webapp **/
- public URL expandedWebApp;
+ public URL webappURL;
/** We can hold "typed" metadata */
public Object metaData;
/** The deployment classloader **/
Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2006-12-22 00:07:12 UTC (rev 1713)
@@ -74,12 +74,20 @@
private static Map<String, String> configMap = new HashMap<String, String>();
static
{
- configMap.put(StubExt.PROPERTY_KEY_STORE, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH);
- configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD);
- configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE);
- configMap.put(StubExt.PROPERTY_TRUST_STORE, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH);
- configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD);
- configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE);
+ // Remoting constants since 2.0.0.GA
+ //configMap.put(StubExt.PROPERTY_KEY_STORE, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH);
+ //configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD);
+ //configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE);
+ //configMap.put(StubExt.PROPERTY_TRUST_STORE, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH);
+ //configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD);
+ //configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE);
+
+ configMap.put(StubExt.PROPERTY_KEY_STORE, "org.jboss.remoting.keyStore");
+ configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, "org.jboss.remoting.keyStorePassword");
+ configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, "org.jboss.remoting.keyStoreType");
+ configMap.put(StubExt.PROPERTY_TRUST_STORE, "org.jboss.remoting.trustStore");
+ configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, "org.jboss.remoting.trustStorePassword");
+ configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, "org.jboss.remoting.trustStoreType");
}
private boolean closed;
@@ -272,7 +280,8 @@
Map<String, Object> metadata = new HashMap<String, Object>();
// We need to unmarshall faults (HTTP 500)
- metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true");
+ // metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true"); // since 2.0.0.GA
+ metadata.put("NoThrowOnError", "true");
Properties props = new Properties();
metadata.put("HEADER", props);
Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-22 00:07:12 UTC (rev 1713)
@@ -113,7 +113,7 @@
<target name="init" depends="prepare,thirdparty">
<!-- Define excluded tests -->
- <condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt">
+ <condition property="tests.excludesfile" value="${test.resources.dir}/tests-excludes.txt">
<equals arg1="${jbossws.target.server}" arg2="jboss"/>
</condition>
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-tomcat-excludes.txt">
@@ -319,7 +319,7 @@
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
<param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/>
- <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/>
+ <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -328,7 +328,7 @@
<target name="tests-benchmark" description="Run benchmark unit tests">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
- <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/>
+ <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -346,7 +346,7 @@
<target name="tests-tools" description="Run tools unit tests">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/>
- <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/>
+ <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -358,7 +358,7 @@
<target name="test" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
- <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/>
+ <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/>
</antcall>
</target>
Modified: branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-22 00:07:12 UTC (rev 1713)
@@ -34,8 +34,6 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.ejb3.client.ClientLauncher;
-import org.jboss.client.AppClientLauncher;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -72,6 +70,7 @@
assertEquals(helloWorld, retObj);
}
+ /* externalize
public void testApplicationClient() throws Throwable
{
String helloWorld = "Hello World!";
@@ -81,4 +80,5 @@
apl.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld});
assertEquals(helloWorld, ApplicationClient.retStr);
}
+ */
}
Copied: branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt (from rev 1685, branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt)
===================================================================
--- branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-21 12:54:28 UTC (rev 1685)
+++ branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt 2006-12-22 00:07:12 UTC (rev 1713)
@@ -0,0 +1 @@
+org/jboss/test/ws/*/benchmark/**
\ No newline at end of file
Deleted: branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt
===================================================================
--- branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-21 21:26:29 UTC (rev 1712)
+++ branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-22 00:07:12 UTC (rev 1713)
@@ -1 +0,0 @@
-/nothing-to-exclude/**
\ No newline at end of file
18 years, 2 months
JBossWS SVN: r1712 - branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 16:26:29 -0500 (Thu, 21 Dec 2006)
New Revision: 1712
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
Log:
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 21:26:25 UTC (rev 1711)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 21:26:29 UTC (rev 1712)
@@ -29,11 +29,11 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
-import org.jboss.mx.server.Invocation;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.JAXWSDeployment;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -84,9 +84,26 @@
if (udi != null)
{
AbstractServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
- endpointPublisher.rewriteWebXml(udi);
+ RewriteResults results = endpointPublisher.rewriteWebXml(udi.url);
+ updateServiceEndpointTargetBeans(udi, results);
}
}
+
+ private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi, RewriteResults results)
+ {
+ UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
+ Map<String, String> sepTargetMap = results.sepTargetMap;
+
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ {
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ String targetBean = sepTargetMap.get(sepMetaData.getLinkName());
+ sepMetaData.setServiceEndpointImplName(targetBean);
+ }
+ }
+ }
/** Return true if the deployment is a web service endpoint
*/
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 21:26:25 UTC (rev 1711)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 21:26:29 UTC (rev 1712)
@@ -49,12 +49,12 @@
public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
{
- URL warURL = udi.expandedWebApp;
DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
if (di == null)
throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
- rewriteWebXml(udi);
+ URL warURL = udi.url;
+ rewriteWebXml(warURL);
// Preserve the repository config
DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
18 years, 2 months