JBossWS SVN: r3257 - in trunk/jbossws-core/src: main/java/org/jboss/ws/tools/wsdl and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-05-25 11:25:08 -0400 (Fri, 25 May 2007)
New Revision: 3257
Added:
trunk/jbossws-core/src/test/resources/tools/jbws1645/BindingPolicy2.txt
trunk/jbossws-core/src/test/resources/tools/jbws1645/PortPolicy2.txt
trunk/jbossws-core/src/test/resources/tools/jbws1645/PortTypePolicy2.txt
trunk/jbossws-core/src/test/resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
Log:
Added test case for multiple policy refs in PolicyURIs attribute
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-25 14:21:30 UTC (rev 3256)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-25 15:25:08 UTC (rev 3257)
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.List;
+import java.util.StringTokenizer;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PolicyReference;
@@ -44,6 +45,7 @@
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement;
import org.jboss.ws.metadata.wsdl.WSDLInterface;
+import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLService;
/**
@@ -177,8 +179,8 @@
WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName());
if (wsdlInterface != null)
{
- List<WSDLExtensibilityElement> portTypePolicyRefList = wsdlInterface.getExtensibilityElements(Constants.WSDL_PROPERTY_POLICYURIS);
- processPolicies(portTypePolicyRefList, PolicyScopeLevel.WSDL_PORT_TYPE, localPolicyRegistry, epMetaData);
+ WSDLProperty portTypePolicyProp = wsdlInterface.getProperty(Constants.WSDL_PROPERTY_POLICYURIS);
+ processPolicies(portTypePolicyProp, PolicyScopeLevel.WSDL_PORT_TYPE, localPolicyRegistry, epMetaData);
}
else
{
@@ -186,6 +188,19 @@
}
}
+ private void processPolicies(WSDLProperty policyProp, PolicyScopeLevel scope, PolicyRegistry localPolicies, ExtensibleMetaData extMetaData)
+ {
+ if (policyProp!=null && policyProp.getValue()!=null)
+ {
+ StringTokenizer st = new StringTokenizer(policyProp.getValue(), " ", false);
+ while (st.hasMoreTokens())
+ {
+ PolicyReference policyRef = new PolicyReference(st.nextToken());
+ deployPolicy(resolvePolicyReference(policyRef, localPolicies), scope, extMetaData);
+ }
+ }
+ }
+
private void processPolicies(List<WSDLExtensibilityElement> policyReferences, PolicyScopeLevel scope, PolicyRegistry localPolicies, ExtensibleMetaData extMetaData)
{
if (policyReferences != null && policyReferences.size() != 0)
@@ -194,22 +209,26 @@
for (WSDLExtensibilityElement element : policyReferences)
{
PolicyReference policyRef = reader.readPolicyReference(element.getElement());
- Policy normPolicy;
- try
- {
- normPolicy = (Policy)policyRef.normalize(localPolicies);
- }
- catch (RuntimeException e)
- {
- //TODO!!! not a local policy: get the policy definition and create the policy
- normPolicy = null;
- }
- deployPolicy(normPolicy, scope, extMetaData);
-
+ deployPolicy(resolvePolicyReference(policyRef, localPolicies), scope, extMetaData);
}
}
}
+ private Policy resolvePolicyReference(PolicyReference policyRef, PolicyRegistry localPolicies)
+ {
+ Policy normPolicy;
+ try
+ {
+ normPolicy = (Policy)policyRef.normalize(localPolicies);
+ }
+ catch (RuntimeException e)
+ {
+ //TODO!!! not a local policy: get the policy definition and create the policy
+ normPolicy = null;
+ }
+ return normPolicy;
+ }
+
private void deployPolicy(Policy policy, PolicyScopeLevel scope, ExtensibleMetaData extMetaData)
{
PolicyDeployer deployer;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-05-25 14:21:30 UTC (rev 3256)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-05-25 15:25:08 UTC (rev 3257)
@@ -177,7 +177,17 @@
protected void addPolicyURIAttribute(Policy policy, Extendable extendable)
{
//TODO!! we need to understand if the policy is local or not...
- extendable.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policy.getPolicyURI()));
+ WSDLProperty prop = extendable.getProperty(Constants.WSDL_PROPERTY_POLICYURIS);
+ if (prop == null)
+ {
+ extendable.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policy.getPolicyURI()));
+ }
+ else
+ {
+ //PolicyURIs ships a comma separated list of URIs...
+ prop.setValue(prop.getValue() + "," + policy.getPolicyURI());
+ }
+
}
protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation)
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-25 14:21:30 UTC (rev 3256)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-25 15:25:08 UTC (rev 3257)
@@ -123,7 +123,61 @@
validateGeneratedWSDL(new File(wsdlPath), new File(fixturefile));
}
+
+
+ public void testWSDLGeneratorWithMultiplePolicies() throws Exception
+ {
+ Class seiClass = StandardJavaTypes.class;
+ String fixturefile = "resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl";
+
+ File wsdlDir = new File("./tools/jbws1645");
+ wsdlDir.mkdirs();
+
+ String sname = WSDLUtils.getJustClassName(seiClass) + "Service-Multiple";
+ String wsdlPath = wsdlDir + "/" + sname + "JBWS1645-Multiple.wsdl";
+ String targetNamespace = "http://org.jboss.ws";
+ Style style = Style.DOCUMENT;
+ JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL11);
+ jwsdl.setServiceName(sname);
+ jwsdl.setTargetNamespace(targetNamespace);
+ jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true);
+ jwsdl.setStyle(style);
+
+ //manually generate the umd using tools
+ UnifiedMetaData umd = new ToolsUnifiedMetaDataBuilder(seiClass, targetNamespace,
+ null, sname, style, null, null).getUnifiedMetaData();
+ jwsdl.setUmd(umd);
+
+ //manually add policies to the umd
+ ServiceMetaData serviceMetaData = umd.getServices().get(0);
+ EndpointMetaData epMetaData = serviceMetaData.getEndpoints().get(0);
+ addPolicy(new File("resources/tools/jbws1645/PortPolicy.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData);
+ addPolicy(new File("resources/tools/jbws1645/PortPolicy2.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData);
+ addPolicy(new File("resources/tools/jbws1645/PortTypePolicy2.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData);
+ addPolicy(new File("resources/tools/jbws1645/PortTypePolicy.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData);
+ addPolicy(new File("resources/tools/jbws1645/BindingPolicy.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData);
+ addPolicy(new File("resources/tools/jbws1645/BindingPolicy2.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData);
+
+ //generate the wsdl definitions and write the wsdl file
+ WSDLDefinitions wsdl = jwsdl.generate(seiClass);
+
+ //performe some trivial checks on wsdl definitions
+ assertEquals(2, wsdl.getServices()[0].getEndpoints()[0].getExtensibilityElements(
+ Constants.WSDL_ELEMENT_POLICYREFERENCE).size());
+ assertNotNull(wsdl.getInterfaces()[0].getProperty(Constants.WSDL_PROPERTY_POLICYURIS));
+ assertEquals(2, wsdl.getBindings()[0].getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE).size());
+ assertEquals(6, wsdl.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY).size());
+
+ Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET);
+ new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET);
+ fw.close();
+
+ //validate the generated WSDL
+ validateGeneratedWSDL(new File(wsdlPath), new File(fixturefile));
+
+ }
+
private void addPolicy(File sourceFile, PolicyScopeLevel scope, ExtensibleMetaData extMetaData) throws Exception
{
PolicyMetaExtension ext = (PolicyMetaExtension)extMetaData.getExtension(Constants.URI_WS_POLICY);
Added: trunk/jbossws-core/src/test/resources/tools/jbws1645/BindingPolicy2.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1645/BindingPolicy2.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1645/BindingPolicy2.txt 2007-05-25 15:25:08 UTC (rev 3257)
@@ -0,0 +1,3 @@
+<wsp:Policy wsu:Id="uselessBindingPolicy2" xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:fab='http://www.fabrikam123.example.com/stock'>
+ <fab:useless>nothing on this binding...</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/tools/jbws1645/PortPolicy2.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1645/PortPolicy2.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1645/PortPolicy2.txt 2007-05-25 15:25:08 UTC (rev 3257)
@@ -0,0 +1,3 @@
+<wsp:Policy wsu:Id="uselessPortPolicy2" xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:fab='http://www.fabrikam123.example.com/stock'>
+ <fab:useless>nothing on this port...</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/tools/jbws1645/PortTypePolicy2.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1645/PortTypePolicy2.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1645/PortTypePolicy2.txt 2007-05-25 15:25:08 UTC (rev 3257)
@@ -0,0 +1,3 @@
+<wsp:Policy wsu:Id="uselessPortTypePolicy2" xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:fab='http://www.fabrikam123.example.com/stock'>
+ <fab:useless>nothing on this port type...</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl
===================================================================
--- trunk/jbossws-core/src/test/resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl (rev 0)
+++ trunk/jbossws-core/src/test/resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl 2007-05-25 15:25:08 UTC (rev 3257)
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='StandardJavaTypesService-Multiple' targetNamespace='http://org.jboss.ws'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://org.jboss.ws'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+ xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+ <wsp:Policy wsu:Id='RmPolicy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <rmp:RMAssertion xmlns:rmp='http://schemas.xmlsoap.org/ws/2005/02/rm/policy'>
+ <rmp:InactivityTimeout Milliseconds='600000' />
+ <rmp:BaseRetransmissionInterval Milliseconds='3000' />
+ <rmp:ExponentialBackoff />
+ <rmp:AcknowledgementInterval Milliseconds='200' />
+ </rmp:RMAssertion>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id='uselessPortPolicy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <fab:useless xmlns:fab='http://www.fabrikam123.example.com/stock'>nothing again</fab:useless>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id='X509EndpointPolicy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <sp:AsymmetricBinding xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy'>
+ <wsp:Policy>
+ <!-- Details omitted for readability -->
+ <sp:IncludeTimestamp />
+ <sp:OnlySignEntireHeadersAndBody />
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id='uselessPortPolicy2' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <fab:useless xmlns:fab='http://www.fabrikam123.example.com/stock'>nothing on this port...</fab:useless>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id='uselessPortTypePolicy2' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <fab:useless xmlns:fab='http://www.fabrikam123.example.com/stock'>nothing on this port type...</fab:useless>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id='uselessBindingPolicy2' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>
+ <fab:useless xmlns:fab='http://www.fabrikam123.example.com/stock'>nothing on this binding...</fab:useless>
+ </wsp:Policy>
+ <types>
+ <schema targetNamespace='http://org.jboss.ws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='echoCalendar'>
+ <sequence>
+ <element name='Calendar_1' nillable='true' type='dateTime'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoCalendarResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='dateTime'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDate'>
+ <sequence>
+ <element name='Date_1' nillable='true' type='dateTime'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDateResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='dateTime'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDecimal'>
+ <sequence>
+ <element name='BigDecimal_1' nillable='true' type='decimal'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDecimalResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='decimal'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoInteger'>
+ <sequence>
+ <element name='BigInteger_1' nillable='true' type='integer'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoIntegerResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='integer'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoQName'>
+ <sequence>
+ <element name='QName_1' nillable='true' type='QName'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoQNameResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='QName'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoString'>
+ <sequence>
+ <element name='String_1' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoStringResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoURI'>
+ <sequence>
+ <element name='URI_1' nillable='true' type='anyURI'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoURIResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='anyURI'/>
+ </sequence>
+ </complexType>
+ <element name='echoCalendar' type='tns:echoCalendar'/>
+ <element name='echoCalendarResponse' type='tns:echoCalendarResponse'/>
+ <element name='echoDate' type='tns:echoDate'/>
+ <element name='echoDateResponse' type='tns:echoDateResponse'/>
+ <element name='echoDecimal' type='tns:echoDecimal'/>
+ <element name='echoDecimalResponse' type='tns:echoDecimalResponse'/>
+ <element name='echoInteger' type='tns:echoInteger'/>
+ <element name='echoIntegerResponse' type='tns:echoIntegerResponse'/>
+ <element name='echoQName' type='tns:echoQName'/>
+ <element name='echoQNameResponse' type='tns:echoQNameResponse'/>
+ <element name='echoString' type='tns:echoString'/>
+ <element name='echoStringResponse' type='tns:echoStringResponse'/>
+ <element name='echoURI' type='tns:echoURI'/>
+ <element name='echoURIResponse' type='tns:echoURIResponse'/>
+ </schema>
+ </types>
+ <message name='StandardJavaTypes_echoCalendar' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part element='tns:echoCalendar' name='echoCalendar'/>
+ </message>
+ <message name='StandardJavaTypes_echoCalendarResponse'>
+ <part element='tns:echoCalendarResponse' name='echoCalendarResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoDate'>
+ <part element='tns:echoDate' name='echoDate'/>
+ </message>
+ <message name='StandardJavaTypes_echoDateResponse'>
+ <part element='tns:echoDateResponse' name='echoDateResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoDecimal'>
+ <part element='tns:echoDecimal' name='echoDecimal'/>
+ </message>
+ <message name='StandardJavaTypes_echoDecimalResponse'>
+ <part element='tns:echoDecimalResponse' name='echoDecimalResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoInteger'>
+ <part element='tns:echoInteger' name='echoInteger'/>
+ </message>
+ <message name='StandardJavaTypes_echoIntegerResponse'>
+ <part element='tns:echoIntegerResponse' name='echoIntegerResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoQName'>
+ <part element='tns:echoQName' name='echoQName'/>
+ </message>
+ <message name='StandardJavaTypes_echoQNameResponse'>
+ <part element='tns:echoQNameResponse' name='echoQNameResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoString'>
+ <part element='tns:echoString' name='echoString'/>
+ </message>
+ <message name='StandardJavaTypes_echoStringResponse'>
+ <part element='tns:echoStringResponse' name='echoStringResponse'/>
+ </message>
+ <message name='StandardJavaTypes_echoURI'>
+ <part element='tns:echoURI' name='echoURI'/>
+ </message>
+ <message name='StandardJavaTypes_echoURIResponse'>
+ <part element='tns:echoURIResponse' name='echoURIResponse'/>
+ </message>
+ <portType name='StandardJavaTypes' wsp:PolicyURIs='#RmPolicy,#uselessPortTypePolicy2'>
+ <operation name='echoCalendar' parameterOrder='echoCalendar'>
+ <input message='tns:StandardJavaTypes_echoCalendar'/>
+ <output message='tns:StandardJavaTypes_echoCalendarResponse'/>
+ </operation>
+ <operation name='echoDate' parameterOrder='echoDate'>
+ <input message='tns:StandardJavaTypes_echoDate'/>
+ <output message='tns:StandardJavaTypes_echoDateResponse'/>
+ </operation>
+ <operation name='echoDecimal' parameterOrder='echoDecimal'>
+ <input message='tns:StandardJavaTypes_echoDecimal'/>
+ <output message='tns:StandardJavaTypes_echoDecimalResponse'/>
+ </operation>
+ <operation name='echoInteger' parameterOrder='echoInteger'>
+ <input message='tns:StandardJavaTypes_echoInteger'/>
+ <output message='tns:StandardJavaTypes_echoIntegerResponse'/>
+ </operation>
+ <operation name='echoQName' parameterOrder='echoQName'>
+ <input message='tns:StandardJavaTypes_echoQName'/>
+ <output message='tns:StandardJavaTypes_echoQNameResponse'/>
+ </operation>
+ <operation name='echoString' parameterOrder='echoString'>
+ <input message='tns:StandardJavaTypes_echoString'/>
+ <output message='tns:StandardJavaTypes_echoStringResponse'/>
+ </operation>
+ <operation name='echoURI' parameterOrder='echoURI'>
+ <input message='tns:StandardJavaTypes_echoURI'/>
+ <output message='tns:StandardJavaTypes_echoURIResponse'/>
+ </operation>
+ </portType>
+ <binding name='StandardJavaTypesBinding' type='tns:StandardJavaTypes'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <wsp:PolicyReference URI='#X509EndpointPolicy' />
+ <wsp:PolicyReference URI='#uselessBindingPolicy2' />
+ <operation name='echoCalendar'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoDate'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoDecimal'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoInteger'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoQName'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoString'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoURI'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='StandardJavaTypesService-Multiple'>
+ <port binding='tns:StandardJavaTypesBinding' name='StandardJavaTypesPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ <wsp:PolicyReference URI='#uselessPortPolicy' />
+ <wsp:PolicyReference URI='#uselessPortPolicy2' />
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
17 years, 8 months
- 1
- 0
JBossWS SVN: r3256 - trunk/integration/xfire.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 10:21:30 -0400 (Fri, 25 May 2007)
New Revision: 3256
Modified:
trunk/integration/xfire/build.xml
Log:
Fix jbossws-xfire.jar
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-25 13:12:54 UTC (rev 3255)
+++ trunk/integration/xfire/build.xml 2007-05-25 14:21:30 UTC (rev 3256)
@@ -162,7 +162,7 @@
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="${xfire.output.lib.dir}">
- <include name="jbossws-xfire50.jar"/>
+ <include name="jbossws-xfire.jar"/>
</fileset>
<fileset dir="${xfire.resources.dir}/jbossws-xfire50.deployer">
<include name="META-INF/jbossws-deployer-beans.xml"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3255 - trunk/integration/sunri/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 09:12:54 -0400 (Fri, 25 May 2007)
New Revision: 3255
Modified:
trunk/integration/sunri/ant-import/build-deploy.xml
Log:
Fix undeploy-jboss50
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 12:05:49 UTC (rev 3254)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 13:12:54 UTC (rev 3255)
@@ -21,8 +21,8 @@
<!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
- <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-sunri50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
17 years, 8 months
- 1
- 0
JBossWS SVN: r3254 - in trunk/build/hudson/hudson-home: jobs and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 08:05:49 -0400 (Fri, 25 May 2007)
New Revision: 3254
Added:
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
Removed:
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
Modified:
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
Log:
Add hudson for sunri, xfire jboss42
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-05-25 11:56:57 UTC (rev 3253)
+++ trunk/build/hudson/hudson-home/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -69,7 +69,9 @@
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
<string>Distro-SunRI-AS-5.0</string>
+ <string>Distro-SunRI-AS-4.2</string>
<string>Distro-XFire-AS-5.0</string>
+ <string>Distro-XFire-AS-4.2</string>
</jobNames>
<name>Distribution Tests</name>
<description>
@@ -89,7 +91,9 @@
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
<string>Integration-SunRI-AS-5.0</string>
+ <string>Integration-SunRI-AS-4.2</string>
<string>Integration-XFire-AS-5.0</string>
+ <string>Integration-XFire-AS-4.2</string>
</jobNames>
<name>Integration Tests</name>
<description>
@@ -118,7 +122,7 @@
<tr align=center><th> </th> <th>Core-Tests</th> <th colspan=3>Integration Tests</th></tr>
<tr align=center><th> </th> <th> </th> <th>Native</th> <th>SunRI</th> <th>XFire</th></tr>
<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td> </td> <td> </td></tr>
+<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
</table>
]]>
</description>
Copied: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2 (from rev 3245, trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0)
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-24 23:54:05 UTC (rev 3245)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -6,14 +6,14 @@
#
# Module settings
#
-MODULE=Distro-SunRI-AS-5.0
+MODULE=Distro-SunRI-AS-4.2
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-JBOSS_INSTANCE=$JBOSS50_INSTANCE
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
+JBOSS_INSTANCE=$JBOSS42_INSTANCE
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
# copy ant.properties
@@ -37,7 +37,7 @@
# Deploy distro
#
cd output/jbossws-sunri-(a)version.id@
-ant $ENVIRONMENT deploy-jboss50
+ant $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -86,7 +86,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-sunri-(a)version.id@ against AS-5.0</description>
+ <description>Build and test jbossws-sunri-(a)version.id@ against AS-4.2</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2 (from rev 3245, trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0)
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-24 23:54:05 UTC (rev 3245)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -6,14 +6,14 @@
#
# Module settings
#
-MODULE=Distro-XFire-AS-5.0
+MODULE=Distro-XFire-AS-4.2
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-JBOSS_INSTANCE=$JBOSS50_INSTANCE
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
+JBOSS_INSTANCE=$JBOSS42_INSTANCE
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
# copy ant.properties
@@ -37,7 +37,7 @@
# Deploy distro
#
cd output/jbossws-xfire-(a)version.id@
-ant $ENVIRONMENT deploy-jboss50
+ant $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -86,7 +86,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Build and test jbossws-xfire-(a)version.id@ against AS-5.0</description>
+ <description>Build and test jbossws-xfire-(a)version.id@ against AS-4.2</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2 (from rev 3245, trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-24 23:54:05 UTC (rev 3245)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Integration-SunRI-AS-5.0
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clobber
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build sunri-jboss50
-#
-cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT deploy-jboss50
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
-sleep 60
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml (from rev 3250, trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Integration-SunRI-AS-4.2
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant clobber
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build sunri-jboss50
+#
+cd $JBWSDIR/integration/sunri
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+sleep 60
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/integration/sunri/output-tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2 (from rev 3245, trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0)
Deleted: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-24 23:54:05 UTC (rev 3245)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Integration-XFire-AS-5.0
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
-ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clobber
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build xfire
-#
-cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT deploy-jboss50
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
-sleep 60
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml (from rev 3250, trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Integration-XFire-AS-5.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant clobber
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build xfire
+#
+cd $JBWSDIR/integration/xfire
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+sleep 60
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/integration/xfire/output-tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-25 11:56:57 UTC (rev 3253)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-25 12:05:49 UTC (rev 3254)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-SunRI-AS-5.0, Integration-XFire-AS-5.0, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-SunRI-AS-5.0, Distro-XFire-AS-5.0</childProjects>
+ <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3253 - in trunk/integration/xfire: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 07:56:57 -0400 (Fri, 25 May 2007)
New Revision: 3253
Modified:
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/build.xml
Log:
XFire jboss42 support - ok
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 11:52:37 UTC (rev 3252)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 11:56:57 UTC (rev 3253)
@@ -50,6 +50,7 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xfire/${xfire}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xfire/${xfire}/lib/jdom.jar" dest="${thirdparty.dir}/jdom.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xfire/${xfire}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-25 11:52:37 UTC (rev 3252)
+++ trunk/integration/xfire/build.xml 2007-05-25 11:56:57 UTC (rev 3253)
@@ -198,6 +198,7 @@
<include name="saaj-impl.jar"/>
<include name="spring.jar"/>
<include name="stax-api.jar"/>
+ <include name="wstx.jar"/>
<include name="xbean.jar"/>
<include name="xbean-spring.jar"/>
<include name="xfire-all.jar"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r3252 - in trunk/integration/xfire/src/main/resources: jbossws-xfire42.sar and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 07:52:37 -0400 (Fri, 25 May 2007)
New Revision: 3252
Added:
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/jboss-service.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
Log:
Start XFire bjoss42 support
Added: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/jboss-service.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/jboss-service.xml (rev 0)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/jboss-service.xml 2007-05-25 11:52:37 UTC (rev 3252)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<server>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB3 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+</server>
Property changes on: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml (rev 0)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-25 11:52:37 UTC (rev 3252)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/>
+
+ <!-- Bind Service objects in client environment context -->
+ <!-- The bean name is compiled into the server. Changeit with the next release. -->
+ <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/-->
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+ 3) DeployerInterceptorEJB3
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeployerManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeployerManager.undeploy(dep)
+
+ Each deployer hook has a web service DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Each DeploymentManger maintains a list of Deployers
+ Each Deployer handles a single aspect of web service deployment.
+ -->
+ <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSXFireServicesDeployer"/>
+ <inject bean="WSModifyWebMetaDataDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSXFireServicesDeployer"/>
+ <inject bean="WSWebAppGeneratorDeployer"/>
+ <inject bean="WSWebAppDeployerDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSEndpointNameDeployer"/>
+ <inject bean="WSEndpointHandlerDeployer"/>
+ <inject bean="WSEndpointRegistryDeployer"/>
+ <inject bean="WSEndpointLifecycleDeployer"/>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ The Deployers
+ Each handles a single aspect of web service deployment
+ -->
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
+ <property name="requestHandler">org.jboss.wsf.stack.xfire.RequestHandlerImpl</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.xfire.LifecycleHandlerImpl</property>
+ <property name="invocationHandler">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry>
+ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+ <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+ <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer">
+ <property name="serviceFactory">org.codehaus.xfire.jaxws.JAXWSServiceFactory</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property>
+ </bean>
+
+ <!-- Deployer helper beans -->
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl">
+ <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property>
+ </bean>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+ <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook">
+ <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 8 months
- 1
- 0
JBossWS SVN: r3251 - in trunk: integration/native and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 07:52:14 -0400 (Fri, 25 May 2007)
New Revision: 3251
Modified:
trunk/build/version.properties
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/build.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/build.xml
trunk/integration/xfire/.classpath
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java
trunk/jbossws-core/version.properties
Log:
Start XFire bjoss42 support
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/build/version.properties 2007-05-25 11:52:14 UTC (rev 3251)
@@ -22,6 +22,7 @@
jboss-jbossxb=2.0.0.CR2
jboss-microcontainer=2.0.0.Beta3
junit=3.8.1
+stax-api=1.0
sun-jaf=1.1
sun-jaxb=2.1.3
sun-jaxrpc=1.1
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -21,7 +21,6 @@
<!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-native50,undeploy-jboss50" description="Deploy jbossws to jboss50">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
@@ -39,7 +38,8 @@
<!-- Deploy to jboss42 -->
<target name="deploy-jboss42" depends="jars-native42,undeploy-jboss42" description="Deploy jbossws to jboss42">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/native/build.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -91,14 +91,12 @@
<target name="jars" depends="compile,jars-native42,jars-native50" description="Builds all jar files.">
</target>
- <!--
- | Build all jar files.
- -->
<target name="jars-native50" depends="compile" if="jboss50.home">
- <mkdir dir="${native.output.lib.dir}"/>
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<!-- Build jbossws-context.war -->
+ <mkdir dir="${native.output.lib.dir}"/>
<war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
<fileset dir="${native.resources.dir}/jbossws-context.war">
<include name="index.html"/>
@@ -142,14 +140,12 @@
</target>
- <!--
- | Build all jar files.
- -->
<target name="jars-native42" depends="compile" if="jboss42.home">
- <mkdir dir="${native.output.lib.dir}"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
<!-- Build jbossws-native42.sar -->
+ <mkdir dir="${native.output.lib.dir}"/>
<jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf">
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war"/>
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -21,9 +21,8 @@
<!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
@@ -38,7 +37,6 @@
<!-- Deploy to jboss42 -->
<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri42
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/sunri/build.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -40,8 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -128,6 +127,8 @@
<target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+
<!-- Build jbossws-sunri50.sar -->
<jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">
<!-- [JBAS-4379] MC beans deployed twice because of jacc service
@@ -175,6 +176,8 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+
<!-- Build jbossws-sunri42.sar -->
<jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf">
<fileset dir="${sunri.output.lib.dir}">
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/.classpath 2007-05-25 11:52:14 UTC (rev 3251)
@@ -13,5 +13,6 @@
<classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
<classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="thirdparty/spring.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -21,7 +21,6 @@
<!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-xfire50
@@ -38,21 +37,18 @@
<!-- Deploy to jboss42 -->
<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
- <!--
<macro-deploy-xfire42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- -->
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <!--macro-undeploy-xfire42/-->
+ <macro-undeploy-xfire42/>
</target>
</project>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -45,6 +45,7 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
@@ -90,6 +91,7 @@
<pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/spring.jar"/>
<pathelement location="${thirdparty.dir}/xfire-all.jar"/>
<pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
</path>
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -14,9 +14,10 @@
<project>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
+ <!-- Deployment -->
<!-- ================================================================== -->
+ <!-- Deploy to jboss50 -->
<macrodef name="macro-deploy-xfire50">
<attribute name="spilibs"/>
<attribute name="jbosslibs"/>
@@ -59,7 +60,7 @@
</sequential>
</macrodef>
- <!-- Remove jbossws/xfire from jboss50 -->
+ <!-- Undeploy from jboss50 -->
<macrodef name="macro-undeploy-xfire50">
<sequential>
<delete>
@@ -76,4 +77,60 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-xfire42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire42.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/xfire from jboss42 -->
+ <macrodef name="macro-undeploy-xfire42">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/build.xml 2007-05-25 11:52:14 UTC (rev 3251)
@@ -40,8 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -128,6 +127,8 @@
<target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+
<!-- Build jbosswsri.sar -->
<jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf">
<!-- [JBAS-4379] MC beans deployed twice because of jacc service
@@ -171,8 +172,43 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+
<!-- Build jbossws-xfire42.sar -->
<jar jarfile="${xfire.output.lib.dir}/jbossws-xfire42.sar" manifest="${xfire.output.etc.dir}/default.mf">
+ <fileset dir="${xfire.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="jaxrpc-api.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${xfire.output.lib.dir}">
+ <include name="jbossws-xfire.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jdom.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="spring.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="xbean.jar"/>
+ <include name="xbean-spring.jar"/>
+ <include name="xfire-all.jar"/>
+ <include name="xfire-jsr181-api.jar"/>
+ </fileset>
+ <fileset dir="${xfire.resources.dir}/jbossws-xfire42.sar">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <metainf dir="${xfire.resources.dir}/jbossws-xfire42.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
</jar>
</target>
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-25 11:52:14 UTC (rev 3251)
@@ -35,14 +35,20 @@
import javax.xml.ws.WebServiceException;
import org.codehaus.xfire.XFire;
+import org.codehaus.xfire.XFireException;
+import org.codehaus.xfire.spring.XFireConfigLoader;
import org.codehaus.xfire.transport.http.XFireConfigurableServlet;
import org.codehaus.xfire.transport.http.XFireServletController;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointAssociation;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
/**
* An extension to the XFire servlet
@@ -56,6 +62,8 @@
private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml";
+ private static Logger log = Logger.getLogger(XFireConfigurableServletExt.class);
+
protected Endpoint endpoint;
protected EndpointRegistry epRegistry;
@@ -66,7 +74,7 @@
// Init the Endpoint
epRegistry = EndpointRegistryFactory.getEndpointRegistry();
String contextPath = servletConfig.getServletContext().getContextPath();
- initServiceEndpoint(contextPath);
+ endpoint = initServiceEndpoint(contextPath);
endpoint.addAttachment(XFireServletController.class, controller);
}
@@ -97,6 +105,34 @@
return xfire;
}
+ public XFire loadConfig(String configPath) throws XFireException
+ {
+ XFireConfigLoader loader = new XFireConfigLoader();
+ //loader.setBasedir(getWebappBase());
+ //log.debug("Loading configuration files relative to " + loader.getBasedir().getAbsolutePath());
+
+ ServletContext servletCtx = getServletContext();
+ ApplicationContext parent = (ApplicationContext) servletCtx.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+
+ if (parent == null)
+ {
+ GenericWebApplicationContext webCtx = new GenericWebApplicationContextX();
+ webCtx.setServletContext(getServletContext());
+ webCtx.refresh();
+ parent = webCtx;
+ }
+
+ ApplicationContext newCtx = loader.loadContext(configPath, parent);
+ if(servletCtx.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null)
+ {
+ servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, newCtx);
+ }
+
+ XFire xfire = (XFire) newCtx.getBean("xfire");
+ xfire.setProperty(XFire.XFIRE_HOME, getWebappBase().getAbsolutePath());
+ return xfire;
+ }
+
public XFireServletController createController() throws ServletException
{
return new XFireServletControllerExt(xfire, getServletContext());
@@ -118,11 +154,12 @@
/** Initialize the service endpoint
*/
- protected void initServiceEndpoint(String contextPath)
+ protected Endpoint initServiceEndpoint(String contextPath)
{
if (contextPath.startsWith("/"))
contextPath = contextPath.substring(1);
+ Endpoint endpoint = null;
String servletName = getServletName();
for (ObjectName sepId : epRegistry.getEndpoints())
{
@@ -141,5 +178,7 @@
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
+
+ return endpoint;
}
}
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-25 10:28:07 UTC (rev 3250)
+++ trunk/jbossws-core/version.properties 2007-05-25 11:52:14 UTC (rev 3251)
@@ -7,7 +7,6 @@
javassist=3.5.0.CR1
jbossws-wsconsume-impl=2.0.0
jbpm-bpel=1.1.0.Beta5
-stax-api=1.0
# Thirdparty library versions
apache-ant=1.6.5
17 years, 8 months
- 1
- 0
JBossWS SVN: r3250 - in trunk: build/hudson/hudson-home/jobs/Integration-Native-AS-5.0 and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-25 06:28:07 -0400 (Fri, 25 May 2007)
New Revision: 3250
Added:
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
Modified:
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/integration/native/.classpath
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
trunk/testsuite/ant-import/build-testsuite.xml
Log:
Add support for SunRI in JBoss42
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -52,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -52,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -52,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/sunri/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -52,7 +52,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/xfire/output-tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/native/.classpath 2007-05-25 10:28:07 UTC (rev 3250)
@@ -3,5 +3,7 @@
<classpathentry kind="src" path="src/main/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="/integration-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -16,15 +16,14 @@
<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
+ <!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="jars-native50" description="Deploy jbossws to jboss50">
+ <!-- Deploy to jboss50 -->
+ <target name="deploy-jboss50" depends="jars-native50,undeploy-jboss50" description="Deploy jbossws to jboss50">
<ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <macro-undeploy-native50/>
<macro-deploy-native50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
@@ -33,15 +32,14 @@
thirdpartylibs="${core.dir}/thirdparty"/>
</target>
- <!-- Remove jbossws from jboss50 -->
+ <!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
</target>
- <!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="jars-native42" description="Deploy jbossws to jboss42">
+ <!-- Deploy to jboss42 -->
+ <target name="deploy-jboss42" depends="jars-native42,undeploy-jboss42" description="Deploy jbossws to jboss42">
<ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
- <macro-undeploy-native42/>
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
@@ -50,7 +48,7 @@
thirdpartylibs="${core.dir}/thirdparty"/>
</target>
- <!-- Remove jbossws from jboss42 -->
+ <!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42">
<macro-undeploy-native42/>
</target>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -10,6 +10,9 @@
<project>
+ <property name="tests.dir" value="${testsuite.dir}/src"/>
+ <property name="tests.output.dir" value="${int.native.dir}/output-tests"/>
+
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -134,12 +134,10 @@
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
</fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/native/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -96,8 +96,6 @@
-->
<target name="jars-native50" depends="compile" if="jboss50.home">
- <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/>
-
<mkdir dir="${native.output.lib.dir}"/>
<!-- Build jbossws-context.war -->
@@ -149,8 +147,6 @@
-->
<target name="jars-native42" depends="compile" if="jboss42.home">
- <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/>
-
<mkdir dir="${native.output.lib.dir}"/>
<!-- Build jbossws-native42.sar -->
@@ -158,9 +154,6 @@
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxws.jar"/>
<include name="jbossws-core.jar"/>
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -16,15 +16,14 @@
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
+ <!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss50 -->
+ <!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
<ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <macro-undeploy-sunri50/>
<macro-deploy-sunri50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
@@ -32,9 +31,26 @@
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
</target>
- <!-- Remove jbossws/sunri from jboss50 -->
+ <!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
</target>
+ <!-- Deploy to jboss42 -->
+ <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42">
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <macro-deploy-sunri42
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri42/>
+ </target>
+
</project>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -10,6 +10,9 @@
<project>
+ <property name="tests.dir" value="${testsuite.dir}/src"/>
+ <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/>
+
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -76,4 +76,60 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-sunri42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <macrodef name="macro-undeploy-sunri42">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -96,17 +96,14 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files.">
+ <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files.">
</target>
- <!--
- | Build all jar files.
- -->
- <target name="jars-jboss50" depends="compile">
+ <target name="jars-common" depends="compile">
- <!-- Build jbossws-sunri50.jar -->
+ <!-- Build jbossws-sunri.jar -->
<mkdir dir="${sunri.output.lib.dir}"/>
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri.output.etc.dir}/default.mf">
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf">
<fileset dir="${sunri.output.classes.dir}">
<include name="org/jboss/wsf/stack/sunri/**"/>
</fileset>
@@ -123,7 +120,15 @@
</webinf>
</war>
- <!-- Build jbosswsri.sar -->
+ <!-- Build jbossws-sunri-src.zip -->
+ <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" >
+ <fileset dir="${sunri.java.dir}"/>
+ </zip>
+ </target>
+
+ <target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+
+ <!-- Build jbossws-sunri50.sar -->
<jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf">
<!-- [JBAS-4379] MC beans deployed twice because of jacc service
<fileset dir="${sunri.output.lib.dir}">
@@ -160,18 +165,55 @@
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="${sunri.output.lib.dir}">
- <include name="jbossws-sunri50.jar"/>
+ <include name="jbossws-sunri.jar"/>
</fileset>
<fileset dir="${sunri.resources.dir}/jbossws-sunri50.deployer">
<include name="META-INF/jbossws-deployer-beans.xml"/>
</fileset>
</zip>
+ </target>
+
+ <target name="jars-jboss42" depends="jars-common" if="jboss42.home">
- <!-- Build jbossws-sunri50-src.zip -->
- <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" >
- <fileset dir="${sunri.java.dir}"/>
- </zip>
-
+ <!-- Build jbossws-sunri42.sar -->
+ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf">
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="jaxrpc-api.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${sunri.output.lib.dir}">
+ <include name="jbossws-sunri.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+ <include name="resolver.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ </fileset>
+ <fileset dir="${sunri.resources.dir}/jbossws-sunri42.sar">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <metainf dir="${sunri.resources.dir}/jbossws-sunri42.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
</target>
<!-- ================================================================== -->
Added: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml (rev 0)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<server>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB3 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+</server>
Property changes on: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml (rev 0)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.sunri.ManagedEndpointRegistry"/>
+
+ <!-- Bind Service objects in client environment context -->
+ <!-- The bean name is compiled into the server. Changeit with the next release. -->
+ <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/-->
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+ 3) DeployerInterceptorEJB3
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeployerManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeployerManager.undeploy(dep)
+
+ Each deployer hook has a web service DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Each DeploymentManger maintains a list of Deployers
+ Each Deployer handles a single aspect of web service deployment.
+ -->
+ <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSSunJaxwsDeployer"/>
+ <inject bean="WSModifyWebMetaDataDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSSunJaxwsDeployer"/>
+ <inject bean="WSWebAppGeneratorDeployer"/>
+ <inject bean="WSWebAppDeployerDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSEndpointNameDeployer"/>
+ <inject bean="WSEndpointHandlerDeployer"/>
+ <inject bean="WSEndpointRegistryDeployer"/>
+ <inject bean="WSEndpointLifecycleDeployer"/>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ The Deployers
+ Each handles a single aspect of web service deployment
+ -->
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
+ <property name="requestHandler">org.jboss.wsf.stack.sunri.RequestHandlerImpl</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.sunri.LifecycleHandlerImpl</property>
+ <property name="invocationHandler">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry>
+ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+ <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+ <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <!-- Deployer helper beans -->
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl">
+ <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property>
+ <property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property>
+ </bean>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+ <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
+ <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook">
+ <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-25 10:28:07 UTC (rev 3250)
@@ -1,2 +1,27 @@
+#
+# $Id$
+#
-# Nothing to exclude
+org/jboss/test/ws/jaxws/samples/asynchronous/**
+org/jboss/test/ws/jaxws/samples/context/**
+# org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/exception/**
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/jaxr/**
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**
+org/jboss/test/ws/jaxws/samples/jsr181pojo/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/oneway/**
+org/jboss/test/ws/jaxws/samples/provider/**
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/webmethod/**
+org/jboss/test/ws/jaxws/samples/webparam/**
+org/jboss/test/ws/jaxws/samples/webresult/**
+org/jboss/test/ws/jaxws/samples/webservice/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+org/jboss/test/ws/jaxws/samples/xop/**
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-25 10:28:07 UTC (rev 3250)
@@ -1,3 +1,6 @@
+#
+# $Id$
+#
org/jboss/test/ws/jaxws/samples/asynchronous/**
org/jboss/test/ws/jaxws/samples/context/**
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -16,15 +16,14 @@
<import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
+ <!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/xfire to jboss50 -->
+ <!-- Deploy to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50">
<ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <macro-undeploy-xfire50/>
<macro-deploy-xfire50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
@@ -32,9 +31,28 @@
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
</target>
- <!-- Remove jbossws/xfire from jboss50 -->
+ <!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
</target>
+ <!-- Deploy to jboss42 -->
+ <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42">
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
+ <!--
+ <macro-deploy-xfire42
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ stacklibs="${int.xfire.dir}/output/lib"
+ thirdpartylibs="${int.xfire.dir}/thirdparty"/>
+ -->
+ </target>
+
+ <!-- Remove from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <!--macro-undeploy-xfire42/-->
+ </target>
+
</project>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -10,6 +10,9 @@
<project>
+ <property name="tests.dir" value="${testsuite.dir}/src"/>
+ <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/>
+
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/xfire/build.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -96,17 +96,14 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files.">
+ <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files.">
</target>
- <!--
- | Build all jar files.
- -->
- <target name="jars-jboss50" depends="compile">
+ <target name="jars-common" depends="compile">
- <!-- Build jbossws-xfire50.jar -->
+ <!-- Build jbossws-xfire.jar -->
<mkdir dir="${xfire.output.lib.dir}"/>
- <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.jar" manifest="${xfire.output.etc.dir}/default.mf">
+ <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire.jar" manifest="${xfire.output.etc.dir}/default.mf">
<fileset dir="${xfire.output.classes.dir}">
<include name="org/jboss/wsf/stack/xfire/**"/>
</fileset>
@@ -123,6 +120,14 @@
</webinf>
</war>
+ <!-- Build jbossws-xfire-src.zip -->
+ <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire-src.zip" >
+ <fileset dir="${xfire.java.dir}"/>
+ </zip>
+ </target>
+
+ <target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+
<!-- Build jbosswsri.sar -->
<jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf">
<!-- [JBAS-4379] MC beans deployed twice because of jacc service
@@ -162,14 +167,15 @@
<include name="META-INF/jbossws-deployer-beans.xml"/>
</fileset>
</zip>
-
- <!-- Build jbossws-xfire50-src.zip -->
- <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" >
- <fileset dir="${xfire.java.dir}"/>
- </zip>
-
</target>
+ <target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+
+ <!-- Build jbossws-xfire42.sar -->
+ <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire42.sar" manifest="${xfire.output.etc.dir}/default.mf">
+ </jar>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Modified: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-25 10:28:07 UTC (rev 3250)
@@ -1,2 +1,27 @@
+#
+# $Id$
+#
-# Nothing to exclude
+org/jboss/test/ws/jaxws/samples/asynchronous/**
+org/jboss/test/ws/jaxws/samples/context/**
+# org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/exception/**
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/jaxr/**
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**
+org/jboss/test/ws/jaxws/samples/jsr181pojo/**
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+org/jboss/test/ws/jaxws/samples/oneway/**
+org/jboss/test/ws/jaxws/samples/provider/**
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/webmethod/**
+org/jboss/test/ws/jaxws/samples/webparam/**
+org/jboss/test/ws/jaxws/samples/webresult/**
+org/jboss/test/ws/jaxws/samples/webservice/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+org/jboss/test/ws/jaxws/samples/xop/**
Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-25 10:28:07 UTC (rev 3250)
@@ -1,3 +1,6 @@
+#
+# $Id$
+#
org/jboss/test/ws/jaxws/samples/asynchronous/**
org/jboss/test/ws/jaxws/samples/context/**
Modified: trunk/testsuite/ant-import/build-testsuite.xml
===================================================================
--- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249)
+++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250)
@@ -1,8 +1,5 @@
<project>
- <property name="tests.dir" value="${testsuite.dir}/src"/>
- <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/>
-
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
<!-- Define jboss.home -->
17 years, 8 months
- 1
- 0
JBossWS SVN: r3249 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-25 05:17:13 -0400 (Fri, 25 May 2007)
New Revision: 3249
Removed:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/jaxws/
Log:
Remove stale package. JAX-WS tools have been moved to integration package
17 years, 8 months
- 1
- 0
JBossWS SVN: r3248 - branches/jbossws-2.0/build/etc.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-25 05:15:25 -0400 (Fri, 25 May 2007)
New Revision: 3248
Modified:
branches/jbossws-2.0/build/etc/wsconsume.sh
Log:
Fix classpath
Modified: branches/jbossws-2.0/build/etc/wsconsume.sh
===================================================================
--- branches/jbossws-2.0/build/etc/wsconsume.sh 2007-05-25 08:37:22 UTC (rev 3247)
+++ branches/jbossws-2.0/build/etc/wsconsume.sh 2007-05-25 09:15:25 UTC (rev 3248)
@@ -66,7 +66,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-integration-tools.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-integration-tools.jar"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
17 years, 8 months
- 1
- 0