JBossWS SVN: r6746 - in stack/cxf/trunk: modules/client/src/main/resources/META-INF and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-29 07:08:57 -0400 (Tue, 29 Apr 2008)
New Revision: 6746
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2160] upgrading to CXF 2.1
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-29 11:08:57 UTC (rev 6746)
@@ -1,10 +0,0 @@
-Apache CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -22,11 +22,13 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
+ <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"
+ id="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
<constructor-arg ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
+ <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
<bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder">
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,7 +24,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.http.HttpBindingFactory"
+ id="org.apache.cxf.binding.http.HttpBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://apache.org/cxf/binding/http</value>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -26,6 +26,7 @@
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
+ id="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
lazy-init="false"
depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory">
<property name="bus" ref="cxf"/>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,8 +23,10 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
- <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
+ <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
+ <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
<bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,5 +24,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
+ id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
</beans>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.transport.jms.JMSTransportFactory"
+ id="org.apache.cxf.transport.jms.JMSTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
+ id="org.apache.cxf.transport.local.LocalTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+ <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
+ class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="false"/>
<property name="threaded" value="false"/>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -25,6 +25,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.cxf.binding.object.ObjectBindingFactory"
+ id="org.apache.cxf.binding.object.ObjectBindingFactory"
lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" >
<property name="bus" ref="cxf"/>
<property name="activationNamespaces">
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -31,7 +31,8 @@
</constructor-arg>
</bean>
- <bean class="org.apache.cxf.ws.policy.PolicyConstants"/>
+ <bean class="org.apache.cxf.ws.policy.PolicyConstants"
+ id="org.apache.cxf.ws.policy.PolicyConstants"/>
<bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
<constructor-arg>
@@ -52,9 +53,11 @@
</constructor-arg>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
+ <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"
+ id="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
<bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl">
+ <property name="bus" ref="cxf"/>
<property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/>
</bean>
@@ -62,17 +65,21 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
+ <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"
+ id="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
+ <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"
+ id="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
<!-- MTOM Policy Support -->
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
+ id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
</beans>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -27,7 +27,8 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
+ <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
<constructor-arg><ref bean="cxf"/></constructor-arg>
</bean>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,7 +24,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true">
+ <bean id="org.apache.cxf.binding.soap.SoapBindingFactory"
+ class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://schemas.xmlsoap.org/soap/</value>
@@ -37,7 +38,9 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
+ id="org.apache.cxf.binding.soap.SoapTransportFactory"
+ lazy-init="true">
<property name="transportIds">
<list>
<value>http://schemas.xmlsoap.org/soap/</value>
@@ -53,7 +56,7 @@
<property name="customEditors">
<map>
<entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/>
+ <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
</entry>
</map>
</property>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
+ id="org.apache.cxf.binding.xml.XMLBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://cxf.apache.org/bindings/xformat</value>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory">
+ <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"
+ id="org.apache.cxf.transport.servlet.ServletTransportFactory">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<set>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,17 +24,17 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
<bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <constructor-arg>
+ <property name="resolvers">
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
<bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.configuration.Configurer"
@@ -42,32 +42,32 @@
</bean>
<bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.binding.BindingFactory"/>
<property name="idsProperty" value="activationNamespaces"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
@@ -96,14 +96,14 @@
<bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <constructor-arg ref="cxf"/>
- <constructor-arg>
+ <property name="bus" ref="cxf"/>
+ <property name="queryHandlers">
<list>
<bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <constructor-arg ref="cxf"/>
+ <property name="bus" ref="cxf"/>
</bean>
</list>
- </constructor-arg>
+ </property>
</bean>
<bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
@@ -115,4 +115,8 @@
<bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
<property name="bus" ref="cxf"/>
</bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
</beans>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-29 11:08:57 UTC (rev 6746)
@@ -1,10 +0,0 @@
-Apache CXF is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -22,11 +22,13 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
+ <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"
+ id="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
<constructor-arg ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
+ <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
<bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder">
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,7 +24,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.http.HttpBindingFactory"
+ id="org.apache.cxf.binding.http.HttpBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://apache.org/cxf/binding/http</value>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,8 +23,10 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
- <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
+ <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
+ <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"
+ id="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
<bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,5 +24,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
+ id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
</beans>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.transport.jms.JMSTransportFactory"
+ id="org.apache.cxf.transport.jms.JMSTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
+ id="org.apache.cxf.transport.local.LocalTransportFactory"
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+ <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
+ class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="false"/>
<property name="threaded" value="false"/>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -25,6 +25,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.cxf.binding.object.ObjectBindingFactory"
+ id="org.apache.cxf.binding.object.ObjectBindingFactory"
lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" >
<property name="bus" ref="cxf"/>
<property name="activationNamespaces">
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -31,7 +31,8 @@
</constructor-arg>
</bean>
- <bean class="org.apache.cxf.ws.policy.PolicyConstants"/>
+ <bean class="org.apache.cxf.ws.policy.PolicyConstants"
+ id="org.apache.cxf.ws.policy.PolicyConstants"/>
<bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
<constructor-arg>
@@ -52,9 +53,11 @@
</constructor-arg>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
+ <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"
+ id="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
<bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl">
+ <property name="bus" ref="cxf"/>
<property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/>
</bean>
@@ -62,17 +65,21 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
+ <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"
+ id="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
+ <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"
+ id="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
<constructor-arg ref="cxf"/>
</bean>
<!-- MTOM Policy Support -->
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
+ id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
+ <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
</beans>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -27,7 +27,8 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
+ <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"
+ id="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
<constructor-arg><ref bean="cxf"/></constructor-arg>
</bean>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,7 +24,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true">
+ <bean id="org.apache.cxf.binding.soap.SoapBindingFactory"
+ class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://schemas.xmlsoap.org/soap/</value>
@@ -37,7 +38,9 @@
<property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
+ id="org.apache.cxf.binding.soap.SoapTransportFactory"
+ lazy-init="true">
<property name="transportIds">
<list>
<value>http://schemas.xmlsoap.org/soap/</value>
@@ -53,7 +56,7 @@
<property name="customEditors">
<map>
<entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/>
+ <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
</entry>
</map>
</property>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,9 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true">
+ <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
+ id="org.apache.cxf.binding.xml.XMLBindingFactory"
+ lazy-init="true">
<property name="activationNamespaces">
<set>
<value>http://cxf.apache.org/bindings/xformat</value>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -23,7 +23,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory">
+ <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"
+ id="org.apache.cxf.transport.servlet.ServletTransportFactory">
<property name="bus" ref="cxf"/>
<property name="transportIds">
<set>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -24,17 +24,17 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
<bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <constructor-arg>
+ <property name="resolvers">
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
<bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.configuration.Configurer"
@@ -42,32 +42,32 @@
</bean>
<bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.binding.BindingFactory"/>
<property name="idsProperty" value="activationNamespaces"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
<bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <constructor-arg>
+ <property name="mapProvider">
<bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
<property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
<property name="idsProperty" value="transportIds"/>
</bean>
- </constructor-arg>
+ </property>
<property name="bus" ref="cxf"/>
</bean>
@@ -96,14 +96,14 @@
<bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <constructor-arg ref="cxf"/>
- <constructor-arg>
+ <property name="bus" ref="cxf"/>
+ <property name="queryHandlers">
<list>
<bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <constructor-arg ref="cxf"/>
+ <property name="bus" ref="cxf"/>
</bean>
</list>
- </constructor-arg>
+ </property>
</bean>
<bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
@@ -115,4 +115,8 @@
<bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
<property name="bus" ref="cxf"/>
</bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
</beans>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/pom.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -100,7 +100,7 @@
<!-- Properties -->
<properties>
- <cxf.version>2.0.5-incubator</cxf.version>
+ <cxf.version>2.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version>
@@ -113,9 +113,10 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <jaxws.api.version>2.0</jaxws.api.version>
+ <jaxws.api.version>2.1-1</jaxws.api.version>
<juddi.service.version>1.2.0.GA</juddi.service.version>
<saaj.api.version>1.3</saaj.api.version>
+ <fastinfoset.api.version>1.2.2</fastinfoset.api.version>
</properties>
<!-- DependencyManagement -->
@@ -235,11 +236,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -284,6 +280,11 @@
<version>${jaxws.api.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>${fastinfoset.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -49,6 +49,7 @@
<include name="**/wstx.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
+ <include name="**/FastInfoset.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -85,6 +86,7 @@
<include name="**/wsdl4j.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
+ <include name="**/FastInfoset.jar"/>
</patternset>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 11:08:57 UTC (rev 6746)
@@ -84,6 +84,7 @@
<include>*:wsdl4j:jar</include>
<include>*:xml-resolver:jar</include>
<include>*:XmlSchema:jar</include>
+ <include>*:FastInfoset:jar</include>
</includes>
</dependencySet>
<dependencySet>
17 years, 12 months
JBossWS SVN: r6745 - in stack/metro/branches/tdiesler/trunk: src/main and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 06:29:17 -0400 (Tue, 29 Apr 2008)
New Revision: 6745
Added:
stack/metro/branches/tdiesler/trunk/ant.properties.example
stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties
stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Removed:
stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example
stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Modified:
stack/metro/branches/tdiesler/trunk/
stack/metro/branches/tdiesler/trunk/build.xml
Log:
Property changes on: stack/metro/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- .settings
target
+ .settings
target
ant.properties
Added: stack/metro/branches/tdiesler/trunk/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/trunk/ant.properties.example (rev 0)
+++ stack/metro/branches/tdiesler/trunk/ant.properties.example 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,17 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBossWS Release
+jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
Modified: stack/metro/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/build.xml 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -11,247 +11,68 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS-Metro">
+<project basedir="." name="JBossWS-Metro">
- <property name="stack.dir" value="${basedir}"/>
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
-
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
+
+ <property name="stack.dir" value="${basedir}"/>
+ <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/>
+ <property name="stack.output.dir" value="${stack.dir}/target"/>
+ <property name="stack.modules.dir" value="${stack.dir}/modules"/>
+ <property name="stack.management.dir" value="${stack.modules.dir}/management"/>
+ <property name="stack.client.dir" value="${stack.modules.dir}/client"/>
+ <property name="stack.server.dir" value="${stack.modules.dir}/server"/>
- <property name="stack.src.dir" value="${stack.dir}/src/main"/>
- <property name="stack.distro.dir" value="${stack.src.dir}/distro"/>
- <property name="stack.etc.dir" value="${stack.src.dir}/etc"/>
- <property name="stack.java.dir" value="${stack.src.dir}/java"/>
- <property name="stack.resources.dir" value="${stack.src.dir}/resources"/>
- <property name="stack.output.dir" value="${stack.dir}/output"/>
- <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/>
- <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/>
- <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/>
- <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/>
- <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/>
- <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/>
+ <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
- <property name="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/>
+ <import file="${stack.distro.dir}/build-setup.xml"/>
+ <import file="${stack.distro.dir}/build-deploy.xml"/>
+ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="prepare,thirdparty">
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-metro"/>
- <target name="compile-classes-metro" depends="init">
- <mkdir dir="${stack.output.classes.dir}"/>
- <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/metro/**"/>
- <classpath refid="stack.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${stack.output.etc.dir}"/>
- <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${stack.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
-
- <!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
+ <target name="init" depends="prepare">
+ <xmlproperty file="${stack.dir}/pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
-
- <!-- Concat jbossws-jboss422-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
- <target name="compile50-resources" if="jbossws.integration.jboss50">
-
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
-
- <!-- Concat jbossws-jboss500-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
-
- <copy todir="${stack.output.resources.dir}">
- <fileset dir="${stack.resources.dir}">
- <include name="jbossws-metro.jar/**"/>
- <include name="jbossws-stack.sar/**"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
- <!-- Archives -->
+ <!-- Distribution -->
<!-- ================================================================== -->
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile" description="Builds all jar files.">
+ <target name="prepare-deploy" depends="prepare">
- <!-- Build jbossws-metro.jar -->
- <mkdir dir="${stack.output.lib.dir}"/>
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/injection/**"/>
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/metadata/**"/>
- <include name="org/jboss/wsf/stack/metro/log/**"/>
- <include name="org/jboss/wsf/stack/metro/*"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/>
- </jar>
-
- <!-- jbossws-metro-client.jar -->
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/tools/**"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${stack.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip">
- <fileset dir="${stack.java.dir}"/>
- </zip>
+ <delete dir="${deploy.artifacts.dir}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="package"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+ <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution">
- <!-- expand the metro sources -->
- <mkdir dir="${stack.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/>
+ <echo message="*************************************"/>
+ <echo message="* mvn -P bindist assembly:directory *"/>
+ <echo message="*************************************"/>
- <mkdir dir="${stack.output.apidocs.dir}"/>
- <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${stack.integration.classpath}"/>
- </classpath>
-
- <packageset dir="${stack.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${stack.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="com/sun/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]>
- </doctitle>
- <tag name="todo" scope="all" description="To do:"/>
-
-
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
-
- </javadoc>
+ <delete dir="${stack.output.dir}/jbossws-metro-dist"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-P bindist"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
<!-- ================================================================== -->
@@ -259,17 +80,14 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${stack.output.dir}"/>
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
</target>
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${stack.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
-
</project>
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,28 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+jboss422.home=(a)jboss422.home@
+jboss423.home=(a)jboss423.home@
+jboss500.home=(a)jboss500.home@
+jboss501.home=(a)jboss501.home@
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBoss JMX invoker authentication
+#jmx.authentication.username=admin
+#jmx.authentication.password=admin
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Deleted: stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,31 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
-
-# Optional JBoss Home
-jboss422.home=(a)jboss422.home@
-jboss423.home=(a)jboss423.home@
-jboss500.home=(a)jboss500.home@
-jboss501.home=(a)jboss501.home@
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
Deleted: stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-
-<project default="main" basedir="." name="JBossWS-Metro">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${basedir}/output"/>
-
- <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
- <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
-
- <property name="jboss422.lib" value="${jboss422.home}/lib"/>
- <property name="jboss422.client" value="${jboss422.home}/client"/>
- <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
- <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
- <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
- <property name="jboss423.lib" value="${jboss423.home}/lib"/>
- <property name="jboss423.client" value="${jboss423.home}/client"/>
- <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
- <property name="jboss500.lib" value="${jboss500.home}/lib"/>
- <property name="jboss500.client" value="${jboss500.home}/client"/>
- <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
-
- <available property="jboss422.available" file="${jboss422.available.file}"/>
- <available property="jboss423.available" file="${jboss423.available.file}"/>
- <available property="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss501.available" file="${jboss501.available.file}"/>
-
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
- <condition property="jbossws.integration.jboss50" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </or>
- </condition>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
-
- <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </condition>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/mimepull.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/wsit-resolver.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xws-security.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-metro-client.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- dummy targets -->
- <target name="prepare-deploy" depends="prepare"/>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
\ No newline at end of file
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro42" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss422">
+ <property name="jbossws.integration.target" value="jboss422"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss423">
+ <property name="jbossws.integration.target" value="jboss423"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro50" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss500">
+ <property name="jbossws.integration.target" value="jboss500"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss501">
+ <property name="jbossws.integration.target" value="jboss501"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Create jbossws-deploy.conf -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-create-deploy-conf">
+ <attribute name="deploystructure"/>
+ <sequential>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+ <property file="${basedir}/ant.properties"/>
+
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
+
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Load jbossws.integration.target properties -->
+ <property file="${target.properties.file}"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project basedir="." name="JBossWS-CXF">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="output.dir" value="${basedir}/output"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${output.dir}"/>
+
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
+
+ <import file="${build.dir}/build-setup.xml"/>
+ <import file="${build.dir}/build-deploy.xml"/>
+ <import file="${build.dir}/jbossws-deploy-macros.xml"/>
+ <import file="${tests.dir}/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare">
+
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
+
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+ <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ </target>
+
+ <target name="tests-init" depends="init,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <fileset dir="${thirdparty.dir}"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ <property name="jbossws.test.log" value="${tests.output.dir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- dummy targets -->
+ <target name="prepare-deploy" depends="init"/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!--
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/stax-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/FastInfoset.jar"/>
+ <include name="**/http.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jaxws-local-transport.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/jbossws-metro.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/jsr173_api.jar"/>
+ <include name="**/jsr250-api.jar"/>
+ <include name="**/mimepull.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/sjsxp.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/stax-utils.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/txnannprocessor.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wsit-resolver.jar"/>
+ <include name="**/wstx.jar"/>
+ <include name="**/xmldsig.jar"/>
+ <include name="**/xmlsec.jar"/>
+ <include name="**/xws-security.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Server Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-metro42-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="resourcesdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
+ </fileset>
+ </copy>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-(a){jbossid}-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-metro50-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"
+ jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts (from rev 6729, stack/cxf/trunk/src/main/scripts)
Deleted: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,85 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>binary-distribution</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <!-- root -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>build.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>ant.properties</include>
- </includes>
- </fileSet>
- <!-- build -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>build</outputDirectory>
- <includes>
- <include>build-deploy.xml</include>
- <include>build-setup.xml</include>
- <include>jbossws-default-deploy.conf</include>
- <include>jbossws-deploy-macros.xml</include>
- </includes>
- </fileSet>
- <!-- docs -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>docs</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>Install.txt</include>
- <include>ReleaseNotes.txt</include>
- <include>JBossORG-EULA.txt</include>
- </includes>
- </fileSet>
- <!-- deploy -->
- <fileSet>
- <directory>target/deploy-artifacts</directory>
- <outputDirectory>deploy</outputDirectory>
- </fileSet>
- <!-- test excludes -->
- <fileSet>
- <directory>modules/testsuite/cxf-tests/src/test</directory>
- <outputDirectory>tests</outputDirectory>
- <includes>
- <include>etc/**</include>
- <include>resources/test-excludes-*.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <!-- framework tests -->
- <dependencySets>
- <dependencySet>
- <outputDirectory>tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:testsuite</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>ant-import/**</include>
- <include>java/org/jboss/test/ws/jaxws/samples/**</include>
- <include>resources/jaxws/samples/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (from rev 6744, stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,85 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>binary-distribution</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- root -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>ant.properties</include>
+ </includes>
+ </fileSet>
+ <!-- build -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>build-deploy.xml</include>
+ <include>build-setup.xml</include>
+ <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-deploy-macros.xml</include>
+ </includes>
+ </fileSet>
+ <!-- docs -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>docs</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>Install.txt</include>
+ <include>ReleaseNotes.txt</include>
+ <include>JBossORG-EULA.txt</include>
+ </includes>
+ </fileSet>
+ <!-- deploy -->
+ <fileSet>
+ <directory>target/deploy-artifacts</directory>
+ <outputDirectory>deploy</outputDirectory>
+ </fileSet>
+ <!-- test excludes -->
+ <fileSet>
+ <directory>modules/testsuite/cxf-tests/src/test</directory>
+ <outputDirectory>tests</outputDirectory>
+ <includes>
+ <include>etc/**</include>
+ <include>resources/test-excludes-*.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <!-- framework tests -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:testsuite</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>resources/jaxws/samples/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Deleted: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,123 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>deploy-artifacts</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss422:jar:*</include>
- <include>*:jbossws-jboss423:jar:*</include>
- <include>*:jbossws-jboss500:jar:*</include>
- <include>*:jbossws-jboss501:jar:*</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <!-- lib -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- <include>org.jboss.ws:jbossws-cxf-server</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- <include>*:geronimo-javamail*</include>
- <include>*:geronimo-ws-metadata*</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jaxb-impl:jar</include>
- <include>*:jaxb-xjc:jar</include>
- <include>*:jaxrpc-api:jar</include>
- <include>*:jaxws-api:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:neethi:jar</include>
- <include>*:saaj-api:jar</include>
- <include>*:saaj-impl:jar</include>
- <include>*:spring-beans:jar</include>
- <include>*:spring-context:jar</include>
- <include>*:spring-core:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xml-resolver:jar</include>
- <include>*:XmlSchema:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:wstx-asl:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-management</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
- <!-- resources -->
- <fileSets>
- <fileSet>
- <directory>modules/server/target/resources</directory>
- <outputDirectory>resources</outputDirectory>
- <includes>
- <include>jbossws-*/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6744, stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,127 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>deploy-artifacts</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+
+ <!-- bin -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+
+ <!-- lib -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss422:jar:*</include>
+ <include>*:jbossws-jboss423:jar:*</include>
+ <include>*:jbossws-jboss500:jar:*</include>
+ <include>*:jbossws-jboss501:jar:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <!-- lib -->
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-client</include>
+ <include>org.jboss.ws:jbossws-metro-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:FastInfoset:jar</include>
+ <include>*:http:jar</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxrpc-api:jar</include>
+ <include>*:jaxws-local-transport:jar</include>
+ <include>*:jaxws-rt:jar</include>
+ <include>*:jaxws-tools:jar</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jboss-wsit-rt:jar</include>
+ <include>*:jboss-wsit-tools:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:jsr181-api:jar</include>
+ <include>*:jsr173_api:jar</include>
+ <include>*:jsr250-api:jar</include>
+ <include>*:mimepull:jar</include>
+ <include>*:saaj-api:jar</include>
+ <include>*:saaj-impl:jar</include>
+ <include>*:sjsxp:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:stax-utils:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:txnannprocessor:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:wstx:jar</include>
+ <include>*:xmldsig:jar</include>
+ <include>*:xmlsec:jar</include>
+ <include>*:xws-security:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <!-- resources -->
+ <fileSets>
+ <fileSet>
+ <directory>modules/server/target/resources</directory>
+ <outputDirectory>resources</outputDirectory>
+ <includes>
+ <include>jbossws-*/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
17 years, 12 months
JBossWS SVN: r6744 - in stack/metro/branches/tdiesler/trunk: modules and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 06:08:29 -0400 (Tue, 29 Apr 2008)
New Revision: 6744
Added:
stack/metro/branches/tdiesler/trunk/modules/testsuite/
stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/
stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/
stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
Removed:
stack/metro/branches/tdiesler/trunk/src/main/resources/
stack/metro/branches/tdiesler/trunk/src/test/
stack/metro/branches/tdiesler/trunk/tools/
Log:
Copied: stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml (from rev 6729, stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 10:08:29 UTC (rev 6744)
@@ -0,0 +1,567 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Framework Tests</name>
+ <artifactId>jbossws-metro-framework-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/test</directory>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/**</include>
+ <include>resources/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>src/test</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!-- EJB3/Injection excludes -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1683] Fix JAXR samples for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [CXF-1244] Application Exception not initialized properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+
+ <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
+ <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+
+ <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
+
+ <!-- [CXF-1510] Cannot handle anonymous bare requests -->
+ <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+
+ <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+
+ <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+
+ <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+
+ <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+
+ <!-- [CXF-1517] HTTP bindings for Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!-- [CXF-1520] MTOM chunked encoding transfer -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+
+ <!-- [CXF-1521] Exception handling with @WebFault annotation -->
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [CXF-1522] NPE in ServiceUtils -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!-- EJB3/Injection excludes -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1683] Fix JAXR samples for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [CXF-1244] Application Exception not initialized properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+
+ <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
+ <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+
+ <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
+
+ <!-- [CXF-1510] Cannot handle anonymous bare requests -->
+ <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+
+ <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+
+ <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+
+ <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+
+ <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+
+ <!-- [CXF-1517] HTTP bindings for Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!-- [CXF-1520] MTOM chunked encoding transfer -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+
+ <!-- [CXF-1521] Exception handling with @WebFault annotation -->
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [CXF-1522] NPE in ServiceUtils -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1683] Fix JAXR samples for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- [CXF-1244] Application Exception not initialized properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+
+ <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
+ <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+
+ <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
+
+ <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
+
+ <!-- [CXF-1510] Cannot handle anonymous bare requests -->
+ <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+
+ <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+
+ <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+
+ <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+
+ <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+
+ <!-- [CXF-1517] HTTP bindings for Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!-- [CXF-1520] MTOM chunked encoding transfer -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+
+ <!-- [CXF-1521] Exception handling with @WebFault annotation -->
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [CXF-1522] NPE in ServiceUtils -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+
+ <!-- [JBWS-2120] @WebWservice does not work with class isolation -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+
+ <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1683] Fix JAXR samples for CXF -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [EJBTHREE-1150] WebServiceContext injection requires mapped-name -->
+ <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude>
+
+ <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*</exclude>
+
+ <!-- [CXF-1244] Application Exception not initialized properly -->
+ <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+
+ <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
+ <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+
+ <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
+ <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
+
+ <!-- TODO: Fix classpath to ClientLauncher -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+
+ <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
+
+ <!-- [CXF-1510] Cannot handle anonymous bare requests -->
+ <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+
+ <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+
+ <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+
+ <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+
+ <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+
+ <!-- [CXF-1517] HTTP bindings for Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!-- [CXF-1520] MTOM chunked encoding transfer -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+
+ <!-- [CXF-1521] Exception handling with @WebFault annotation -->
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [CXF-1522] NPE in ServiceUtils -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+
+ <!-- [JBAS-5359] mapped-name is required for context of deployment -->
+ <exclude>org/jboss/test/ws/console/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+
+ <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory - ->
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude-->
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Copied: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml (from rev 6729, stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 10:08:29 UTC (rev 6744)
@@ -0,0 +1,128 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Specific Tests</name>
+ <artifactId>jbossws-metro-specific-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="src/scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="src/scripts/metro-samples-jaxws.xml" target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Copied: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test (from rev 6741, stack/metro/branches/tdiesler/trunk/src/test)
Copied: stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml (from rev 6729, stack/cxf/trunk/modules/testsuite/pom.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 10:08:29 UTC (rev 6744)
@@ -0,0 +1,300 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack CXF Testsuite</name>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
+ </properties>
+
+ <!-- Modules -->
+ <modules>
+ <module>metro-tests</module>
+ <module>framework-tests</module>
+ </modules>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-client</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <testResources>
+ <!-- copy etc files -->
+ <testResource>
+ <directory>src/test/etc</directory>
+ </testResource>
+ <!-- copy handler definitions -->
+ <testResource>
+ <targetPath>../test-classes</targetPath>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <!-- copy non binary files -->
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.wsdl</include>
+ <include>**/*.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ <!-- copy binary files -->
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/*.wsdl</exclude>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <!--argLine>${surefire.jdpw.args}</argLine-->
+ <systemProperties>
+ <property>
+ <name>java.naming.provider.url</name>
+ <value>jnp://${jboss.bind.address}:1099</value>
+ </property>
+ <property>
+ <name>java.util.logging.manager</name>
+ <value>org.jboss.wsf.common.logging.JDKLogManager</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>jbossws.integration.target</name>
+ <value>${jbossws.integration.target}</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>${project.build.directory}/test-log</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
+ <name>test.resources.directory</name>
+ <value>${project.build.directory}/test-resources</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <properties>
+ <jboss.version>4.2.2.GA</jboss.version>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <properties>
+ <jboss.version>4.2.3-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss423</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <properties>
+ <jboss.version>5.0.0.Beta4</jboss.version>
+ <jbossws.integration.target>jboss500</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: no-jboss-bind-address
+ Descr: Set the default jboss.bind.address
+
+ command line cannot overwrite pom properties
+ http://jira.codehaus.org/browse/MNG-3546
+ -->
+ <profile>
+ <id>no-jboss-bind-address</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss.bind.address>localhost</jboss.bind.address>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
17 years, 12 months
JBossWS SVN: r6743 - in stack/metro/branches/tdiesler/trunk/modules: server/src/main/resources and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 06:01:06 -0400 (Tue, 29 Apr 2008)
New Revision: 6743
Added:
stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/
Removed:
stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro-client.jar/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro.jar/
Modified:
stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
Copied: stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF (from rev 6742, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro-client.jar/META-INF)
Copied: stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar (from rev 6741, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro.jar)
Modified: stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-29 09:58:50 UTC (rev 6742)
+++ stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-29 10:01:06 UTC (rev 6743)
@@ -35,7 +35,7 @@
<header trimleading="yes">
<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"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -47,7 +47,7 @@
<header trimleading="yes">
<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"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -58,7 +58,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
@@ -68,7 +68,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
17 years, 12 months
JBossWS SVN: r6742 - in stack/metro/branches/tdiesler/trunk: modules/client and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 05:58:50 -0400 (Tue, 29 Apr 2008)
New Revision: 6742
Added:
stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/
Removed:
stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro-config.xml
stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro.jar/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-client.jar/
Modified:
stack/metro/branches/tdiesler/trunk/
stack/metro/branches/tdiesler/trunk/modules/client/
stack/metro/branches/tdiesler/trunk/modules/server/
Log:
Property changes on: stack/metro/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
.settings
+ .settings
target
Property changes on: stack/metro/branches/tdiesler/trunk/modules/client
___________________________________________________________________
Name: svn:ignore
+ target
Copied: stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources (from rev 6741, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources)
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2008-04-29 09:51:21 UTC (rev 6741)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/jbossws-metro-config.xml 2008-04-29 09:58:50 UTC (rev 6742)
@@ -1,117 +0,0 @@
-
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- 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>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>javax.enterprise.resource.webservices.jaxws</value>
- <value>com.sun</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
- <!--
- The stack specific deployment aspects
- -->
- <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">StackDescriptor</property>
- </bean>
-
- <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
- <property name="requires">RuntimeLoader, StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
- </bean>
- <!-- Deployment aspect installers -->
-
- <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <!-- phase 2 -->
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
-
- <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <!-- phase 2 -->
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/server
___________________________________________________________________
Name: svn:ignore
+ target
17 years, 12 months
JBossWS SVN: r6741 - in stack/metro/branches/tdiesler/trunk: modules/client and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 05:51:21 -0400 (Tue, 29 Apr 2008)
New Revision: 6741
Added:
stack/metro/branches/tdiesler/trunk/modules/client/src/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/
Removed:
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/log/
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/metadata/
stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/client/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-context.war/
Modified:
stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
stack/metro/branches/tdiesler/trunk/pom.xml
Log:
Modified: stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 08:42:23 UTC (rev 6740)
+++ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 09:51:21 UTC (rev 6741)
@@ -30,15 +30,18 @@
</dependency>
<!-- Metro dependencies -->
-
- <!--
- useStrictFiltering requires dependency in all included modules
- http://jira.codehaus.org/browse/MASSEMBLY-317
- -->
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
Copied: stack/metro/branches/tdiesler/trunk/modules/client/src (from rev 6739, stack/metro/branches/tdiesler/trunk/modules/server/src)
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,596 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-// $Id$
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.MTOMFeature;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.xml.sax.EntityResolver;
-
-import com.sun.xml.ws.api.BindingID;
-import com.sun.xml.ws.api.WSBinding;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.SDDocumentSource;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory;
-import com.sun.xml.ws.binding.WebServiceFeatureList;
-import com.sun.xml.ws.handler.HandlerChainsModel;
-import com.sun.xml.ws.resources.ServerMessages;
-import com.sun.xml.ws.resources.WsservletMessages;
-import com.sun.xml.ws.server.EndpointFactory;
-import com.sun.xml.ws.server.ServerRtException;
-import com.sun.xml.ws.streaming.Attributes;
-import com.sun.xml.ws.streaming.TidyXMLStreamReader;
-import com.sun.xml.ws.streaming.XMLStreamReaderUtil;
-import com.sun.xml.ws.transport.http.HttpAdapter;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-import com.sun.xml.ws.util.HandlerAnnotationInfo;
-import com.sun.xml.ws.util.exception.LocatableWebServiceException;
-import com.sun.xml.ws.util.xml.XmlUtil;
-
-/**
- * A copy of DeploymentDescriptorParser
- * @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
- * @author WS Development Team
- * @author Kohsuke Kawaguchi
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DeploymentDescriptorParserExt<A>
-{
- private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
-
- public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime";
- public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl";
- public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints");
- public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint");
- public static final String ATTR_VERSION = "version";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_IMPLEMENTATION = "implementation";
- public static final String ATTR_WSDL = "wsdl";
- public static final String ATTR_SERVICE = "service";
- public static final String ATTR_PORT = "port";
- public static final String ATTR_URL_PATTERN = "url-pattern";
- public static final String ATTR_ENABLE_MTOM = "enable-mtom";
- public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value";
- public static final String ATTR_BINDING = "binding";
- public static final String ATTRVALUE_VERSION_1_0 = "2.0";
-
- private final Container container;
- private final ClassLoader classLoader;
- private final ResourceLoader loader;
- private final AdapterFactory<A> adapterFactory;
-
- private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
-
- /**
- * Endpoint names that are declared.
- * Used to catch double definitions.
- */
- private final Set<String> names = new HashSet<String>();
-
- /**
- * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID.
- */
- private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>();
-
- /**
- *
- * @param cl
- * Used to load service implementations.
- * @param loader
- * Used to locate resources, in particular WSDL.
- * @param container
- * Optional {@link Container} that {@link WSEndpoint}s receive.
- * @param adapterFactory
- * Creates {@link HttpAdapter} (or its derived class.)
- */
- public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
- {
- classLoader = cl;
- this.loader = loader;
- this.container = container;
- this.adapterFactory = adapterFactory;
-
- // toggle EJB and WEB deployments
- String resourcePath = "/META-INF/";
- try
- {
- URL resource = loader.getResource(resourcePath);
- InputStream inputStream = null;
- try
- {
- inputStream = resource.openStream();
- }
- finally
- {
- if(inputStream!=null)
- inputStream.close();
- }
-
- log.warn("bypass collectDocs(), it doesnt work for EJB endpoints");
- }
- catch (Exception e)
- {
- resourcePath = "/WEB-INF/";
- log.debug("Collecting docs from " + resourcePath);
-
- collectDocs(resourcePath+"wsdl/");
- logger.fine("metadata=" + docs);
- }
-
- }
-
- /**
- * Parses the {@code sun-jaxws.xml} file and configures
- * a set of {@link HttpAdapter}s.
- */
- public List<A> parse(String systemId, InputStream is)
- {
- XMLStreamReader reader = null;
- try
- {
- reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is);
- XMLStreamReaderUtil.nextElementContent(reader);
- return parseAdapters(reader);
- }
- finally
- {
- if (reader != null)
- {
- try
- {
- reader.close();
- }
- catch (XMLStreamException e)
- {
- throw new ServerRtException("runtime.parser.xmlReader", e);
- }
- }
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- // ignore
- }
- }
- }
-
- /**
- * Parses the {@code sun-jaxws.xml} file and configures
- * a set of {@link HttpAdapter}s.
- */
- public List<A> parse(File f) throws IOException
- {
- FileInputStream in = new FileInputStream(f);
- try
- {
- return parse(f.getPath(), in);
- }
- finally
- {
- in.close();
- }
- }
-
- /**
- * Get all the WSDL & schema documents recursively.
- */
- private void collectDocs(String dirPath) throws MalformedURLException
- {
- Set<String> paths = loader.getResourcePaths(dirPath);
- if (paths != null)
- {
- for (String path : paths)
- {
- if (path.endsWith("/"))
- {
- collectDocs(path);
- }
- else
- {
- URL res = loader.getResource(path);
- docs.put(res.toString(), SDDocumentSource.create(res));
- }
- }
- }
- }
-
- private List<A> parseAdapters(XMLStreamReader reader)
- {
- if (!reader.getName().equals(QNAME_ENDPOINTS))
- {
- failWithFullName("runtime.parser.invalidElement", reader);
- }
-
- List<A> adapters = new ArrayList<A>();
-
- Attributes attrs = XMLStreamReaderUtil.getAttributes(reader);
- String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION);
- if (!version.equals(ATTRVALUE_VERSION_1_0))
- {
- failWithLocalName("runtime.parser.invalidVersionNumber", reader, version);
- }
-
- while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT)
- if (reader.getName().equals(QNAME_ENDPOINT))
- {
-
- attrs = XMLStreamReaderUtil.getAttributes(reader);
- String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME);
- if (!names.add(name))
- {
- logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/));
- }
-
- String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION);
- Class<?> implementorClass = getImplementorClass(implementationName, reader, this.classLoader);
- EndpointFactory.verifyImplementorClass(implementorClass);
-
- SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass, this.classLoader, this.docs);
-
- QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE);
- if (serviceName == null)
- serviceName = EndpointFactory.getDefaultServiceName(implementorClass);
-
- QName portName = getQNameAttribute(attrs, ATTR_PORT);
- if (portName == null)
- portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass);
-
- //get enable-mtom attribute value
- String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM);
- String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE);
- String bindingId = getAttribute(attrs, ATTR_BINDING);
- if (bindingId != null)
- // Convert short-form tokens to API's binding ids
- bindingId = getBindingIdForToken(bindingId);
- WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold);
- String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN);
-
- // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary.
-
- boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName, this.classLoader);
-
- ensureNoContent(reader);
- Invoker invoker = createInvoker(implementorClass);
- WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
- serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
- adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
- }
- else
- {
- failWithLocalName("runtime.parser.invalidElement", reader);
- }
- return adapters;
- }
-
- protected Invoker createInvoker(Class<?> implementorClass)
- {
- Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker();
- return invoker;
- }
-
- /**
- * @param ddBindingId
- * binding id explicitlyspecified in the DeploymentDescriptor or parameter
- * @param implClass
- * Endpoint Implementation class
- * @param mtomEnabled
- * represents mtom-enabled attribute in DD
- * @param mtomThreshold
- * threshold value specified in DD
- * @return
- * is returned with only MTOMFeature set resolving the various precendece rules
- */
- private static WSBinding createBinding(String ddBindingId, Class<?> implClass, String mtomEnabled, String mtomThreshold)
- {
- // Features specified through DD
- WebServiceFeatureList features;
-
- MTOMFeature mtomfeature = null;
- if (mtomEnabled != null)
- {
- if (mtomThreshold != null)
- mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold));
- else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled));
- }
-
- BindingID bindingID;
- if (ddBindingId != null)
- {
- bindingID = BindingID.parse(ddBindingId);
- features = bindingID.createBuiltinFeatureList();
-
- if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature))
- {
- throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled));
- }
- }
- else
- {
- bindingID = BindingID.parse(implClass);
- // Since bindingID is coming from implclass,
- // mtom through Feature annotation or DD takes precendece
-
- features = new WebServiceFeatureList();
- if (mtomfeature != null)
- features.add(mtomfeature); // this wins over MTOM setting in bindingID
- features.addAll(bindingID.createBuiltinFeatureList());
- }
-
- return bindingID.createBinding(features.toArray());
- }
-
- private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs)
- {
- if (lhs == null || rhs == null)
- return false;
- return lhs.isEnabled() ^ rhs.isEnabled();
- }
-
- /**
- * JSR-109 defines short-form tokens for standard binding Ids. These are
- * used only in DD. So stand alone deployment descirptor should also honor
- * these tokens. This method converts the tokens to API's standard
- * binding ids
- *
- * @param lexical binding attribute value from DD. Always not null
- *
- * @return returns corresponding API's binding ID or the same lexical
- */
- private static String getBindingIdForToken(String lexical)
- {
- if (lexical.equals("##SOAP11_HTTP"))
- {
- return SOAPBinding.SOAP11HTTP_BINDING;
- }
- else if (lexical.equals("##SOAP11_HTTP_MTOM"))
- {
- return SOAPBinding.SOAP11HTTP_MTOM_BINDING;
- }
- else if (lexical.equals("##SOAP12_HTTP"))
- {
- return SOAPBinding.SOAP12HTTP_BINDING;
- }
- else if (lexical.equals("##SOAP12_HTTP_MTOM"))
- {
- return SOAPBinding.SOAP12HTTP_MTOM_BINDING;
- }
- else if (lexical.equals("##XML_HTTP"))
- {
- return HTTPBinding.HTTP_BINDING;
- }
- return lexical;
- }
-
- /**
- * Checks the deployment descriptor or {@link @WebServiceProvider} annotation
- * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}.
- *
- * @return
- * The pointed WSDL, if any. Otherwise null.
- */
- private static SDDocumentSource getPrimaryWSDL
- (
- XMLStreamReader xsr,
- Attributes attrs,
- Class<?> implementorClass,
- ClassLoader loader,
- Map<String, SDDocumentSource> docs
- )
- {
- String wsdlFile = getAttribute(attrs, ATTR_WSDL);
- if (wsdlFile == null)
- {
- wsdlFile = EndpointFactory.getWsdlLocation(implementorClass);
- }
-
- if (wsdlFile != null)
- {
- URL wsdl = loader.getResource(wsdlFile);
- if (wsdl == null)
- {
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr);
- }
-
- // bypass the docs init
- docs.put(wsdl.toExternalForm(), SDDocumentSource.create(wsdl));
-
- SDDocumentSource docInfo = docs.get(wsdl.toExternalForm());
- assert docInfo != null;
- return docInfo;
- }
-
- return null;
- }
-
- /**
- * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}.
- */
- private static EntityResolver createEntityResolver(ResourceLoader loader)
- {
- try
- {
- return XmlUtil.createEntityResolver(loader.getCatalogFile());
- }
- catch (MalformedURLException e)
- {
- throw new WebServiceException(e);
- }
- }
-
- private static String getAttribute(Attributes attrs, String name)
- {
- String value = attrs.getValue(name);
- if (value != null)
- {
- value = value.trim();
- }
- return value;
- }
-
- private static QName getQNameAttribute(Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value == null || value.equals(""))
- {
- return null;
- }
- else
- {
- return QName.valueOf(value);
- }
- }
-
- /*
- private static String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value != null && value.equals(""))
- {
- failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
- }
- return value;
- }
-
- private static String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value == null)
- {
- failWithLocalName("runtime.parser.missing.attribute", reader, name);
- }
- return value;
- }*/
-
- private static String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name)
- {
- String value = getAttribute(attributes, name);
- if (value == null)
- {
- failWithLocalName("runtime.parser.missing.attribute", reader, name);
- }
- else if (value.equals(""))
- {
- failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
- }
- return value;
- }
-
- /**
- * Parses the handler and role information and sets it
- * on the {@link WSBinding}.
- * @return true if <handler-chains> element present in DD false otherwise.
- */
- private static boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName, ClassLoader classLoader)
- {
- if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS))
- {
- return false;
- }
-
- HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding);
- binding.setHandlerChain(handlerInfo.getHandlers());
- if (binding instanceof SOAPBinding)
- {
- ((SOAPBinding)binding).setRoles(handlerInfo.getRoles());
- }
-
- // move past </handler-chains>
- XMLStreamReaderUtil.nextContent(reader);
- return true;
- }
-
- private static void ensureNoContent(XMLStreamReader reader)
- {
- if (reader.getEventType() != XMLStreamConstants.END_ELEMENT)
- {
- fail("runtime.parser.unexpectedContent", reader);
- }
- }
-
- private static void fail(String key, XMLStreamReader reader)
- {
- logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber());
- throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber()));
- }
-
- private static void failWithFullName(String key, XMLStreamReader reader)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName());
- }
-
- private static void failWithLocalName(String key, XMLStreamReader reader)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName());
- }
-
- private static void failWithLocalName(String key, XMLStreamReader reader, String arg)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg);
- }
-
- /**
- * Loads the class of the given name.
- * @param reader used to report the source location information if there's any error
- */
- private static Class<?> getImplementorClass(String name, XMLStreamReader reader, ClassLoader classLoader)
- {
- try
- {
- return Class.forName(name, true, classLoader);
- }
- catch (ClassNotFoundException e)
- {
- logger.log(Level.SEVERE, e.getMessage(), e);
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
- }
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-// $Id$
-
-import java.net.MalformedURLException;
-
-import javax.ejb.Stateless;
-
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-
-/**
- * A copy of DeploymentDescriptorParser that externalizes
- *
- * createInvoker(Class)
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A>
-{
- public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
- {
- super(cl, loader, container, adapterFactory);
- }
-
- @Override
- protected Invoker createInvoker(Class<?> implClass)
- {
- Invoker invoker;
- InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass);
- if (implClass.isAnnotationPresent(Stateless.class))
- {
- invoker = new InvokerEJB3(resolver);
- }
- else
- {
- invoker = new InvokerJSE(resolver);
- }
- return invoker;
- }
-
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.common.KernelAwareSPIFactory;
-
-/**
- * An EndpointRegistryFactory implementation that retrieves
- * the registry from MC kernel.
- *
- * @see EndpointRegistry.BEAN_NAME
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 23, 2007
- */
-public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
-{
- public EndpointRegistry getEndpointRegistry()
- {
- return new KernelAwareSPIFactory().getKernelProvidedSPI(
- EndpointRegistry.BEAN_NAME, EndpointRegistry.class
- );
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.common.ObjectNameFactory;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.management.ObjectName;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class EndpointServlet extends HttpServlet
-{
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- public void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
- try
- {
- EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /** Initialize the service endpoint
- */
- protected void initServiceEndpoint(String contextPath)
- {
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
- this.endpoint = epRegistry.resolve(resolver);
-
- if (this.endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
- );
- throw new WebServiceException("Cannot obtain endpoint for: " + oname);
- }
-
- // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- dep.setRuntimeClassLoader(classLoader);
- }
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,116 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-// $Id$
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WSWebServiceContext;
-
-/**
- * An invoker for EJB3 endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class InvokerEJB3 extends Invoker
-{
- private final InstanceResolver resolver;
- private WSWebServiceContext webServiceCtx;
-
- public InvokerEJB3(InstanceResolver resolver)
- {
- this.resolver = resolver;
- }
-
- @Override
- public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
- {
- this.resolver.start(webServiceCtx, endpoint);
- this.webServiceCtx = webServiceCtx;
- }
-
- @Override
- public void dispose()
- {
- this.resolver.dispose();
- }
-
- @Override
- public <T> T invokeProvider(Packet p, T arg)
- {
- Object targetBean = this.resolver.resolve(p);
- return ((Provider<T>)targetBean).invoke(arg);
- }
-
- @Override
- public Object invoke(Packet p, Method m, Object... args)
- throws InvocationTargetException, IllegalAccessException
- {
- Endpoint endpoint = EndpointAssociation.getEndpoint();
- InvocationHandler invocationHandler = endpoint.getInvocationHandler();
- Invocation invocation = invocationHandler.createInvocation();
- invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
- invocation.setJavaMethod(m);
- invocation.setArgs(args);
-
- Object retObj = null;
- try
- {
- invocationHandler.invoke(endpoint, invocation);
- retObj = invocation.getReturnValue();
- }
- catch (Exception ex)
- {
- handleException(ex);
- }
-
- return retObj;
- }
-
- private void handleException(Exception ex)
- throws InvocationTargetException, IllegalAccessException
- {
- if (ex instanceof InvocationTargetException)
- throw (InvocationTargetException)ex;
-
- if (ex instanceof IllegalAccessException)
- throw (IllegalAccessException)ex;
-
- throw new WebServiceException(ex);
- }
-}
\ No newline at end of file
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,116 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-// $Id$
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WSWebServiceContext;
-
-/**
- * An invoker for JSE endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class InvokerJSE extends Invoker
-{
- private final InstanceResolver resolver;
-
- public InvokerJSE(InstanceResolver resolver)
- {
- this.resolver = resolver;
- }
-
- @Override
- public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
- {
- resolver.start(webServiceCtx, endpoint);
- }
-
- @Override
- public void dispose()
- {
- resolver.dispose();
- }
-
- @Override
- public <T> T invokeProvider(Packet p, T arg)
- {
- Object targetBean = resolver.resolve(p);
- return ((Provider<T>)targetBean).invoke(arg);
- }
-
- @Override
- public Object invoke(Packet p, Method m, Object... args)
- throws InvocationTargetException, IllegalAccessException
- {
- Endpoint endpoint = EndpointAssociation.getEndpoint();
- InvocationHandler invocationHandler = endpoint.getInvocationHandler();
- Invocation invocation = invocationHandler.createInvocation();
- InvocationContext invContext = invocation.getInvocationContext();
- invocation.setJavaMethod(m);
- invocation.setArgs(args);
-
- Object retObj = null;
- try
- {
- Object targetBean = resolver.resolve(p);
- invContext.setTargetBean(targetBean);
- invocationHandler.invoke(endpoint, invocation);
- retObj = invocation.getReturnValue();
- }
- catch (Exception ex)
- {
- handleException(ex);
- }
-
- return retObj;
- }
-
- private void handleException(Exception ex)
- throws InvocationTargetException, IllegalAccessException
- {
- if (ex instanceof InvocationTargetException)
- throw (InvocationTargetException)ex;
-
- if (ex instanceof IllegalAccessException)
- throw (IllegalAccessException)ex;
-
- throw new WebServiceException(ex);
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.Adapter;
-import com.sun.xml.ws.api.server.TransportBackChannel;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Heiko Braun
- */
-public class MessageStreamAdapter extends Adapter<MessageStreamAdapter.StreamToolkit>
-{
- public static final AdapterFactory<MessageStreamAdapter> FACTORY = new AdapterFactory<MessageStreamAdapter>()
- {
- public MessageStreamAdapter createAdapter(String name, String urlPattern, WSEndpoint<?> endpoint)
- {
- return new MessageStreamAdapter(endpoint);
- }
- };
-
- public MessageStreamAdapter(WSEndpoint endpoint)
- {
- super(endpoint);
- }
-
- public void handle(MessageStreamContext context, InputStream in, OutputStream out)
- throws IOException
- {
- MessageStreamConnectionImpl connection = new MessageStreamConnectionImpl(context, in, out);
-
- StreamToolkit tk = pool.take();
- try
- {
- tk.handle(connection);
- connection.flush();
- }
- finally
- {
- pool.recycle(tk);
- connection.close();
- }
- }
-
- protected StreamToolkit createToolkit()
- {
- return new StreamToolkit();
- }
-
- class StreamToolkit extends Adapter.Toolkit implements TransportBackChannel
- {
- private MessageStreamConnectionImpl connection;
-
- private void handle(MessageStreamConnectionImpl connection)
- throws IOException
- {
- this.connection = connection;
-
- String contentTypeStr = connection.getRequestHeader(MessageStreamContext.CONTENT_TYPE);
- InputStream in = connection.getInputStream();
- Packet packet = new Packet();
- codec.decode(in, contentTypeStr, packet);
-
- try
- {
- packet = head.process(packet, connection, this);
- }
- catch(Exception e)
- {
- e.printStackTrace();
- connection.setStatus(MessageStreamContext.STATUS_INTERNAL_SERVER_ERROR);
- return;
- }
-
- contentTypeStr = codec.getStaticContentType(packet).getContentType();
- if (contentTypeStr == null)
- {
- throw new UnsupportedOperationException();
- }
- else
- {
- Map<String, String> headers = new HashMap();
- headers.put(MessageStreamContext.CONTENT_TYPE, contentTypeStr);
- connection.setResponseHeaders(headers);
- codec.encode(packet, connection.getOutputStream());
- }
- }
-
- public void close()
- {
- connection.close();
- }
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,181 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WebServiceContextDelegate;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Heiko Braun
- */
-public class MessageStreamConnectionImpl implements WebServiceContextDelegate
-{
- private int status;
- private boolean isClosed;
- private InputStream inputStream;
- private OutputStream outputStream;
- private MessageStreamContext messageContext;
- private Map<String, String> requestHeaders = new HashMap<String, String>();
- private Map<String, String> responseHeaders;
-
- public MessageStreamConnectionImpl(MessageStreamContext context, InputStream in, OutputStream out)
- {
- this.outputStream = out;
- this.inputStream = in;
- this.messageContext = context;
- populateRequestHeaders();
- }
-
- public int getStatus()
- {
- return this.status;
- }
-
- public void setStatus(int statusCode)
- {
- this.status = statusCode;
- }
-
- public Map<String, String> getRequestHeaders()
- {
- return this.requestHeaders;
- }
-
- public void setRequestHeaders(Map<String, String> requestHeaders)
- {
- this.requestHeaders = requestHeaders;
- }
-
- public String getRequestHeader(String name)
- {
- return this.requestHeaders.get(name);
- }
-
- public Map<String, String> getResponseHeaders()
- {
- return this.responseHeaders;
- }
-
- public void setResponseHeaders(Map<String, String> responseHeaders)
- {
- this.responseHeaders = responseHeaders;
- }
-
- public InputStream getInputStream()
- {
- return this.inputStream;
- }
-
- public OutputStream getOutputStream()
- {
- return this.outputStream;
- }
-
- public void closeInput()
- {
- if (this.inputStream != null)
- {
- try
- {
- this.inputStream.close();
- }
- catch (IOException ignore) {}
- this.inputStream = null;
- }
- }
-
- public void closeOutput()
- {
- if (this.outputStream != null)
- {
- try
- {
- this.outputStream.close();
- }
- catch (IOException ignore) {}
- this.outputStream = null;
- }
- }
-
- public void close()
- {
- if (this.isClosed == false)
- {
- synchronized (this)
- {
- if (this.isClosed == false)
- {
- this.isClosed = true;
- closeInput();
- closeOutput();
- }
- }
- }
- }
-
- public void flush()
- throws IOException
- {
- if (this.outputStream != null)
- {
- this.outputStream.flush();
- }
- }
-
- public Principal getUserPrincipal(Packet request)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isUserInRole(Packet request, String role)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public String getEPRAddress(Packet request, WSEndpoint endpoint)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public String getWSDLAddress(Packet request, WSEndpoint endpoint)
- {
- throw new UnsupportedOperationException();
- }
-
- private void populateRequestHeaders()
- {
- for(String s : this.messageContext.getRequestContext().keySet())
- {
- this.requestHeaders.put(s, this.messageContext.getRequestContext().get(s));
- }
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author Heiko Braun
- */
-class MessageStreamContext
-{
- public static final int STATUS_INTERNAL_SERVER_ERROR = 500;
- public static final String CONTENT_TYPE = "Content-Type";
-
- private Map<String, String> requestContext = new HashMap<String, String>();
- private Map<String, String> responseContext = new HashMap<String, String>();
-
- public Map<String, String> getRequestContext()
- {
- return requestContext;
- }
-
- public void setRequestContext(Map<String, String> requestContext)
- {
- this.requestContext = requestContext;
- }
-
- public Map<String, String> getResponseContext()
- {
- return responseContext;
- }
-
- public void setResponseContext(Map<String, String> responseContext)
- {
- this.responseContext = responseContext;
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.management.AbstractServerConfig;
-
-/**
- * Basic implementation of a ServerConfig
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean
-{
- private static final Logger log = Logger.getLogger(MetroServerConfig.class);
-
- public String getImplementationTitle()
- {
- return getClass().getPackage().getImplementationTitle();
- }
-
- public String getImplementationVersion()
- {
- return getClass().getPackage().getImplementationVersion();
- }
-
- public void create() throws Exception
- {
- log.info(getImplementationTitle());
- log.info(getImplementationVersion());
- super.create();
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.wsf.common.management.AbstractServerConfigMBean;
-
-/**
- * Basic implementation of a ServerConfig
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public interface MetroServerConfigMBean extends AbstractServerConfigMBean
-{
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class RequestHandlerFactoryImpl extends RequestHandlerFactory
-{
- public RequestHandler newRequestHandler()
- {
- return new RequestHandlerImpl();
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,288 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-//$Id$
-
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.common.IOUtils;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Map;
-import java.util.Properties;
-import java.net.URL;
-
-/**
- * Request handler that delegates to Metro's ServletAdapter.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-class RequestHandlerImpl implements RequestHandler
-{
- // provide logging
- private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
-
- RequestHandlerImpl()
- {
- }
-
- /**
- * Handles HTTP requests. It supports <b>POST</b> and <b>GET</b> HTTP methods only.
- * @param endpoint endpoint
- * @param req servlet request to handle
- * @param res servlet response to return
- * @param servletCtx servlet context
- * @throws ServletException when some problem occurs
- * @throws IOException when some IO problem occurs
- */
- public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext servletCtx)
- throws ServletException, IOException
- {
- ServletAdapter target = endpoint.getAttachment(ServletAdapter.class);
- if(null == target)
- throw new IllegalStateException("Cannot obtain ServletAdapter");
-
- EndpointAssociation.setEndpoint(endpoint);
- try
- {
- String method = req.getMethod();
- if (method.equals("POST"))
- {
- doPost(target, servletCtx, req, res);
- }
- else if(method.equals("GET"))
- {
- doGet(target, req, servletCtx, res);
- }
- else
- {
- throw new WebServiceException("Unsupported method: " + method);
- }
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /**
- * The InvocationContext accepts a {@link Properties} attachment that can carry request properties.<br/>
- * The properties keys are derived from {@link org.jboss.wsf.stack.metro.MessageStreamContext}
- * @param endpoint endpoint
- * @param inStream input stream
- * @param outStream output stream
- * @param invCtx invocation context
- */
- public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invCtx)
- {
- MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class);
- if (adapter == null)
- throw new IllegalStateException("Cannot obtain: " + adapter.getClass().getName());
-
- try
- {
- // Hacky, but the InvokerJSE requires it.
- // It's better to do it here than outside the RequestHandler.
- EndpointAssociation.setEndpoint(endpoint);
-
- MessageStreamContext streamContext = new MessageStreamContext();
- copyProperties(invCtx, streamContext);
- adapter.handle(streamContext, inStream, outStream );
- }
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process request: " + e.getMessage(), e);
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /**
- * Handles HTTP get request. It obtains endpoint's address and constructs URL with <b>?wsdl</b> query string.
- * The constructed URL is used to create the input stream to read WSDL content from and submited to the user.
- * @param endpoint endpoint
- * @param outStream output stream
- * @param invCtx invocation context
- */
- public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext invCtx)
- {
- String endpointAddress = endpoint.getAddress();
- if (endpointAddress == null)
- throw new IllegalArgumentException("Invalid endpoint address: " + endpointAddress);
-
- InputStream inStream = null;
- try
- {
- URL wsdlUrl = new URL(endpointAddress + "?wsdl");
- inStream = wsdlUrl.openStream();
- IOUtils.copyStream(outStream, inStream);
- }
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
- }
- finally
- {
- // close input stream when available
- try
- {
- if(inStream!=null) inStream.close();
- }
- catch (IOException ignore) {}
- // close output stream when available
- try
- {
- if(outStream!=null) outStream.close();
- }
- catch (IOException ignore) {}
- }
- }
-
- /**
- * Handles HTTP GET request using Metro's ServletAdapter <b>publishWSDL</b> method
- * @param target Metro's ServletAdapter
- * @param req request message
- * @param context servlet context
- * @param res response message
- * @throws ServletException if some problem occurs
- */
- private static void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
- throws ServletException
- {
- try
- {
- if (target != null)
- {
- String query = req.getQueryString();
- if (isMetadataQuery(query))
- {
- // Sends published WSDL and schema documents
- target.publishWSDL(context, req, res);
- return;
- }
- else
- {
- sendResponse(405, "HTTP GET not supported", res);
- }
- }
- else
- {
- sendResponse(404, "Not found", res);
- }
- }
- catch (Exception e)
- {
- log.error("Failed to process GET request", e);
- throw new ServletException(e.getMessage());
- }
- }
-
- /**
- * Handles HTTP POST request using Metro's ServletAdapter <b>handle</b> method
- * @param target Metro's ServletAdapter
- * @param req request message
- * @param context servlet context
- * @param res response message
- * @throws ServletException if some problem occurs
- */
- private static void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
- {
- try
- {
- target.handle(context, req, res);
- }
- catch (Throwable e)
- {
- log.error("Failed to process POST request", e);
- res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- }
- }
-
- /**
- * Copies properties from invocation context to message context when properties are available
- * @param invCtx invocation context
- * @param msgCtx message context
- */
- private static void copyProperties(InvocationContext invCtx, MessageStreamContext msgCtx)
- {
- boolean invCtxAvailable = (invCtx != null);
- boolean invCtxHasProps = (invCtx.getAttachment(Properties.class) != null);
-
- if (invCtxAvailable && invCtxHasProps)
- {
- Map<String, String> msgReqCtx = msgCtx.getRequestContext();
- Properties invCtxProps = invCtx.getAttachment(Properties.class);
-
- // copy invocation properties to message request context
- for(Object keyObject : invCtxProps.keySet())
- {
- String key = (String)keyObject;
- msgReqCtx.put(key, invCtxProps.getProperty(key));
- }
- }
- }
-
- /**
- * Sends HTTP text message to the client
- * @param status HTTP status code to return
- * @param message text message
- * @param res response to write message to
- * @throws IOException when some IO problem occurs
- */
- private static void sendResponse(int status, String message, HttpServletResponse res)
- throws IOException
- {
- res.setStatus(status);
- res.setContentType("text/plain");
- Writer out = res.getWriter();
- out.write(message);
- out.close();
- }
-
- /**
- * Returns true if the given query string is for metadata request.
- * @param query HTTP query, can be null
- * @return true for metadata requests false otherwise
- */
- private static boolean isMetadataQuery(String query)
- {
- // we intentionally return true even if documents don't exist, so that they get 404.
- return (query != null) && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
- }
-
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-// $Id$
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import com.sun.xml.ws.transport.http.ResourceLoader;
-
-/**
- * {@link ResourceLoader} backed by {@link ServletContext}.
- *
- * TDI: A copy of the original that is public
- *
- * @author WS Development Team
- * @author Thomas.Diesler(a)jboss.org
- */
-public class ServletResourceLoader implements ResourceLoader
-{
- private final ServletContext context;
-
- public ServletResourceLoader(ServletContext context)
- {
- this.context = context;
- }
-
- public URL getResource(String path) throws MalformedURLException
- {
- return context.getResource(path);
- }
-
- public URL getCatalogFile() throws MalformedURLException
- {
- return getResource("/WEB-INF/jax-ws-catalog.xml");
- }
-
- public Set<String> getResourcePaths(String path)
- {
- return context.getResourcePaths(path);
- }
-}
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
-import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
-import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
-
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.SOAPBinding;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * An aspect that generates sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class SunJaxwsDeploymentAspect extends DeploymentAspect
-{
- @Override
- @SuppressWarnings("unchecked")
- public void create(Deployment dep, WSFRuntime runtime)
- {
- DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
- if (ddEndpoints == null)
- {
- ddEndpoints = new DDEndpoints();
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- String endpointName = endpoint.getShortName();
- String targetBean = endpoint.getTargetBeanName();
- String urlPattern = endpoint.getURLPattern();
-
- DDEndpoint ddEndpoint = new DDEndpoint(endpointName, targetBean, urlPattern);
- Class beanClass = endpoint.getTargetBeanClass();
- BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
-
- if (bindingType != null && bindingType.value().length() > 0)
- {
- String binding = bindingType.value();
- ddEndpoint.setBinding(binding);
- ddEndpoint.setEnableMTOM(isMtomEnabled(binding));
- }
-
- log.info("Add " + ddEndpoint);
- ddEndpoints.addEndpoint(ddEndpoint);
- }
-
- dep.addAttachment(DDEndpoints.class, ddEndpoints);
- putSunJaxwsConfigToDeployment(dep, ddEndpoints.createFileURL());
- }
- }
-
- @Override
- public void destroy(Deployment dep, WSFRuntime runtime)
- {
- DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
- if (dd != null)
- {
- dd.destroyFileURL();
- }
- }
-
- /**
- * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
- * @param dep deployment where to put
- * @param dd beans to be put
- */
- private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL)
- {
- // get property map
- String propKey = "org.jboss.ws.webapp.ContextParameterMap";
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
- if (contextParams == null)
- {
- // if there's no associated map with the property create it now
- contextParams = new HashMap<String, String>();
- dep.setProperty(propKey, contextParams);
- }
- // put sun jaxws config URL to the property map
- contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm());
- }
-
- private static boolean isMtomEnabled(String binding)
- {
- return binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
- }
-}
\ No newline at end of file
Deleted: stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-04-29 09:51:21 UTC (rev 6741)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.metro;
-
-import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.management.ObjectName;
-import java.util.Iterator;
-
-/**
- * Resolves Endpoints by Servlet name and web context path.
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class WebAppResolver implements EndpointResolver
-{
- private String contextPath;
- private String servletName;
-
- public WebAppResolver(String contextPath, String servletName)
- {
- this.contextPath = contextPath;
- this.servletName = servletName;
- }
-
- public Endpoint query(Iterator<Endpoint> endpoints)
- {
- Endpoint endpoint = null;
-
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
-
- while(endpoints.hasNext())
- {
- Endpoint auxEndpoint = endpoints.next();
- ObjectName sepId = auxEndpoint.getName();
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = auxEndpoint;
- break;
- }
- }
-
- return endpoint;
- }
-}
Modified: stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 08:42:23 UTC (rev 6740)
+++ stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 09:51:21 UTC (rev 6741)
@@ -51,12 +51,24 @@
</dependency>
<!-- Metro dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
<groupId>jboss.common</groupId>
<artifactId>jboss-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Copied: stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources (from rev 6734, stack/metro/branches/tdiesler/trunk/src/main/resources)
Copied: stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts (from rev 6729, stack/cxf/trunk/modules/server/src/main/scripts)
Modified: stack/metro/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 08:42:23 UTC (rev 6740)
+++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 09:51:21 UTC (rev 6741)
@@ -27,7 +27,7 @@
WS Stack Integration: | jbossws-native | | jbossws-metro | | jbossws-cxf | | |
+~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack: | jbossws-core | | Sun Metro | | Apache Metro | | |
+ WS Stack: | jbossws-core | | Sun Metro | | Apache CXF | | |
+~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
| | | | | | | | | | | | | |
@@ -91,12 +91,12 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <!-- Modules - ->
+ <!-- Modules -->
<modules>
<module>modules/management</module>
<module>modules/server</module>
<module>modules/client</module>
- </modules-->
+ </modules>
<!-- Properties -->
<properties>
@@ -223,6 +223,12 @@
<version>1.0-MR1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Metro dependencies -->
<dependency>
@@ -231,6 +237,12 @@
<version>${sun.jaxws.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <version>${sun.jaxws.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- jboss provided -->
<dependency>
17 years, 12 months
JBossWS SVN: r6740 - stack/metro/branches/tdiesler/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 04:42:23 -0400 (Tue, 29 Apr 2008)
New Revision: 6740
Removed:
stack/metro/branches/tdiesler/trunk/Metro-Branch.ipr
stack/metro/branches/tdiesler/trunk/ant-import-tests/
stack/metro/branches/tdiesler/trunk/ant-import/
stack/metro/branches/tdiesler/trunk/ant.properties.example
stack/metro/branches/tdiesler/trunk/build.bat
stack/metro/branches/tdiesler/trunk/build.sh
stack/metro/branches/tdiesler/trunk/metro-trunk.iml
stack/metro/branches/tdiesler/trunk/version.properties
Modified:
stack/metro/branches/tdiesler/trunk/.classpath
Log:
Modified: stack/metro/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,15 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target-eclipse/classes" path="src/main/java"/>
- <classpathentry kind="src" output="target-eclipse/test-classes" path="src/test/java">
- <attributes>
- <attribute name="maven.type" value="test"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
+ <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 kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target-eclipse/classes"/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Deleted: stack/metro/branches/tdiesler/trunk/Metro-Branch.ipr
===================================================================
--- stack/metro/branches/tdiesler/trunk/Metro-Branch.ipr 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/Metro-Branch.ipr 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
- <component name="AntConfiguration">
- <defaultAnt bundledAnt="true" />
- </component>
- <component name="BuildJarProjectSettings">
- <option name="BUILD_JARS_ON_MAKE" value="false" />
- </component>
- <component name="CodeStyleProjectProfileManger">
- <option name="PROJECT_PROFILE" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- </component>
- <component name="CodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS" />
- <option name="USE_PER_PROJECT_SETTINGS" value="false" />
- </component>
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
- <resourceExtensions>
- <entry name=".+\.(properties|xml|html|dtd|tld)" />
- <entry name=".+\.(gif|png|jpeg|jpg)" />
- </resourceExtensions>
- <wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- <entry name="?*.html" />
- <entry name="?*.dtd" />
- <entry name="?*.tld" />
- </wildcardResourcePatterns>
- </component>
- <component name="DataSourceManagerImpl" />
- <component name="DependenciesAnalyzeManager">
- <option name="myForwardDirection" value="false" />
- </component>
- <component name="DependencyValidationManager" />
- <component name="EclipseCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="true" />
- <option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="EclipseEmbeddedCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="true" />
- <option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="EntryPointsManager">
- <entry_points />
- </component>
- <component name="ExportToHTMLSettings">
- <option name="PRINT_LINE_NUMBERS" value="false" />
- <option name="OPEN_IN_BROWSER" value="false" />
- <option name="OUTPUT_DIRECTORY" />
- </component>
- <component name="GUI Designer component loader factory" />
- <component name="IdProvider" IDEtalkID="130CB95840D679D1651689A38EB02B70" />
- <component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
- <profiles>
- <profile version="1.0" is_locked="false">
- <option name="myName" value="Project Default" />
- <option name="myLocal" value="false" />
- <used_levels>
- <error>
- <option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
- </error>
- <warning>
- <option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
- </warning>
- <information>
- <option name="myName" value="INFO" />
- <option name="myVal" value="200" />
- </information>
- <server>
- <option name="myName" value="SERVER PROBLEM" />
- <option name="myVal" value="100" />
- </server>
- </used_levels>
- </profile>
- </profiles>
- </component>
- <component name="JavacSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="JavadocGenerationManager">
- <option name="OUTPUT_DIRECTORY" />
- <option name="OPTION_SCOPE" value="protected" />
- <option name="OPTION_HIERARCHY" value="true" />
- <option name="OPTION_NAVIGATOR" value="true" />
- <option name="OPTION_INDEX" value="true" />
- <option name="OPTION_SEPARATE_INDEX" value="true" />
- <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
- <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
- <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
- <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
- <option name="OPTION_DEPRECATED_LIST" value="true" />
- <option name="OTHER_OPTIONS" value="" />
- <option name="HEAP_SIZE" />
- <option name="LOCALE" />
- <option name="OPEN_IN_BROWSER" value="true" />
- </component>
- <component name="JikesSettings">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="LogConsolePreferences">
- <option name="FILTER_ERRORS" value="false" />
- <option name="FILTER_WARNINGS" value="false" />
- <option name="FILTER_INFO" value="true" />
- <option name="CUSTOM_FILTER" />
- </component>
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/Metro-Branch.iml" filepath="$PROJECT_DIR$/Metro-Branch.iml" />
- <module fileurl="file://$PROJECT_DIR$/cvs/cvs-metro.iml" filepath="$PROJECT_DIR$/cvs/cvs-metro.iml" />
- <module fileurl="file://$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" />
- <module fileurl="file://$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" />
- </modules>
- </component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/classes" />
- </component>
- <component name="ProjectRunConfigurationManager" />
- <component name="RmicSettings">
- <option name="IS_EANABLED" value="false" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="StarteamVcsAdapter" />
- <component name="VssVcs" />
- <component name="com.intellij.jsf.UserDefinedFacesConfigs">
- <option name="USER_DEFINED_CONFIGS">
- <value>
- <list size="0" />
- </value>
- </option>
- </component>
- <component name="libraryTable" />
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
- </component>
- <UsedPathMacros />
-</project>
-
Deleted: stack/metro/branches/tdiesler/trunk/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/trunk/ant.properties.example 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/ant.properties.example 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,57 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# Optional JBoss Home
-#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
-#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
-#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Endpoint servlet used by test descriptors
-endpoint.servlet=org.jboss.wsf.stack.metro.EndpointServlet
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
-
-# Metro CVS access
-#
-# Go to the WSIT Membership page
-# https://wsit.dev.java.net/servlets/ProjectMemberList
-#
-# Login or register for an account. If you already have a java.net account, you may need to request additional permissions.
-# https://wsit.dev.java.net/servlets/ProjectMembershipRequest
-#
-# Login to CVS
-# cvs -d :pserver:yourid@cvs.dev.java.net:/cvs login
-#
-cvs.user=guest
Deleted: stack/metro/branches/tdiesler/trunk/build.bat
===================================================================
--- stack/metro/branches/tdiesler/trunk/build.bat 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/build.bat 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,101 +0,0 @@
-@echo off
-
-REM ======================================================================
-REM
-REM This is the main entry point for the build system.
-REM
-REM Users should be sure to execute this file rather than 'ant' to ensure
-REM the correct version is being used with the correct configuration.
-REM
-REM ======================================================================
-REM
-REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $
-
-REM ******************************************************
-REM Ignore the ANT_HOME variable: we want to use *our*
-REM ANT version and associated JARs.
-REM ******************************************************
-REM Ignore the users classpath, cause it might mess
-REM things up
-REM ******************************************************
-
-SETLOCAL
-
-set NOPAUSE=true
-set CLASSPATH=
-set ANT_HOME=
-
-set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat
-
-REM
-REM - "for" loops have been unrolled for compatibility
-REM with some WIN32 systems.
-REM ******************************************************
-
-set NAMES=tools\ant
-set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
-
-REM ******************************************************
-REM ********Save the command line arguments***************
-REM ******************************************************
-set BUILD_ARGS=%1
-if ""%1""=="""" goto completedArgs
-shift
-:processArg
-if ""%1""=="""" goto completedArgs
-set BUILD_ARGS=%BUILD_ARGS% %1
-shift
-goto processArg
-
-:completedArgs
-
-REM ******************************************************
-REM ******************************************************
-
-SET EXECUTED=FALSE
-for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ********* Search for names in the subfolders *********
-REM ******************************************************
-
-:subLoop
-for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************ Test if ANT Batch file exists ***********
-REM ******************************************************
-
-:testIfExists
-if exist %1 call :BatchFound %1 %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************** Batch file has been found *************
-REM ******************************************************
-
-:BatchFound
-if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS%
-set EXECUTED=TRUE
-
-goto :EOF
-
-REM ******************************************************
-REM ************* Execute Batch file only once ***********
-REM ******************************************************
-
-:ExecuteBatch
-echo Calling %1 %BUILD_ARGS%
-
-REM set ENDORSED=
-call %1 %BUILD_ARGS%
-
-:end
-
-if "%NOPAUSE%" == "" pause
-
Deleted: stack/metro/branches/tdiesler/trunk/build.sh
===================================================================
--- stack/metro/branches/tdiesler/trunk/build.sh 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/build.sh 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,169 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## This is the main entry point for the build system. ##
-## ##
-## Users should be sure to execute this file rather than 'ant' to ensure ##
-## the correct version is being used with the correct configuration. ##
-## ##
-## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
-## ##
-### ====================================================================== ###
-
-# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-GREP="grep"
-ROOT="/"
-
-# Ignore user's ANT_HOME if it is set
-ANT_HOME=""
-
-# the default search path for ant
-ANT_SEARCH_PATH="tools/ant"
-
-# the default build file name
-ANT_BUILD_FILE="build.xml"
-
-# the default arguments
-ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-esac
-
-#
-# Helper to complain.
-#
-die() {
- echo "${PROGNAME}: $*"
- exit 1
-}
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to source a file if it exists.
-#
-maybe_source() {
- for file in $*; do
- if [ -f "$file" ]; then
- . $file
- fi
- done
-}
-
-search() {
- search="$*"
- for d in $search; do
- ANT_HOME="`pwd`/$d"
- ANT="$ANT_HOME/bin/ant"
- if [ -x "$ANT" ]; then
- # found one
- echo $ANT_HOME
- break
- fi
- done
-}
-
-#
-# Main function.
-#
-main() {
- # if there is a build config file. then source it
- maybe_source "$DIRNAME/build.conf"
-
- # Increase the maximum file descriptors if we can
- if [ $cygwin = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
- fi
-
- # try the search path
- ANT_HOME=`search $ANT_SEARCH_PATH`
-
- # try looking up to root
- if [ "x$ANT_HOME" = "x" ]; then
- target="build"
- _cwd=`pwd`
-
- while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
- cd ..
- cwd=`pwd`
- ANT_HOME=`search $ANT_SEARCH_PATH`
- done
-
- # make sure we get back
- cd $_cwd
-
- if [ "$cwd" != "$ROOT" ]; then
- found="true"
- fi
-
- # complain if we did not find anything
- if [ "$found" != "true" ]; then
- die "Could not locate Ant; check \$ANT or \$ANT_HOME."
- fi
- fi
-
- # make sure we have one
- ANT=$ANT_HOME/bin/ant
- if [ ! -x "$ANT" ]; then
- die "Ant file is not executable: $ANT"
- fi
-
- # Set the max memory to 256m
- ANT_OPTS=-Xmx256m
-
- # Endorse JAXB, JAXWS API
- ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed"
-
- # setup some build properties
- ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
-
- # change to the directory where the script lives so users are not forced
- # to be in the same directory as build.xml
- cd $DIRNAME
-
- # export some stuff for ant
- export ANT ANT_HOME ANT_OPTS
-
- # run ant
- $ANT $ANT_OPTIONS "$@"
-}
-
-##
-## Bootstrap
-##
-
-main "$@"
Deleted: stack/metro/branches/tdiesler/trunk/metro-trunk.iml
===================================================================
--- stack/metro/branches/tdiesler/trunk/metro-trunk.iml 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/metro-trunk.iml 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/jaxws-src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr250-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/sjsxp.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr173_api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/FastInfoset.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module" module-name="framework" />
- <orderEntry type="module" module-name="spi" />
- <orderEntryProperties />
- </component>
-</module>
-
Deleted: stack/metro/branches/tdiesler/trunk/version.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/version.properties 2008-04-29 08:40:46 UTC (rev 6739)
+++ stack/metro/branches/tdiesler/trunk/version.properties 2008-04-29 08:42:23 UTC (rev 6740)
@@ -1,47 +0,0 @@
-
-# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=metro-3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Sun Metro
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Dependend integration projects
-jbossws-spi=3.0.0-SNAPSHOT
-jbossws-common=3.0.0-SNAPSHOT
-jbossws-framework=3.0.2-SNAPSHOT
-
-jbossws-jboss422=3.0.0-SNAPSHOT
-jbossws-jboss423=3.0.0-SNAPSHOT
-jbossws-jboss500=3.0.0-SNAPSHOT
-jbossws-jboss501=3.0.0-SNAPSHOT
-
-junit=3.8.1
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
-jboss-jaxr=1.2.0.GA
-jboss-security-spi=2.0.0.Beta
-sun-fi=1.2.2
-sun-jaf=1.1
-sun-jaxb=2.1.6
-sun-jaxrpc=1.1
-sun-jaxws=2.1.3
-sun-servlet=2.5
-stax-api=1.0
-ibm-wsdl4j=1.6.2
-woodstox=3.1.1
-
-xml-commons=1.2
-xml-sec=1.3
-sun-javamail=1.4
-
-# metro cvs
-metro.cvs.tag=metro1_1-release
17 years, 12 months
JBossWS SVN: r6739 - in stack/metro/branches/tdiesler/trunk: modules and 9 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 04:40:46 -0400 (Tue, 29 Apr 2008)
New Revision: 6739
Added:
stack/metro/branches/tdiesler/trunk/modules/
stack/metro/branches/tdiesler/trunk/modules/client/
stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
stack/metro/branches/tdiesler/trunk/modules/management/
stack/metro/branches/tdiesler/trunk/modules/server/
stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
stack/metro/branches/tdiesler/trunk/modules/server/src/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/
stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/
stack/metro/branches/tdiesler/trunk/pom.xml
Removed:
stack/metro/branches/tdiesler/trunk/src/main/java/
stack/metro/branches/tdiesler/trunk/src/main/resources/jbossws-context.war/
Modified:
stack/metro/branches/tdiesler/trunk/
stack/metro/branches/tdiesler/trunk/.classpath
stack/metro/branches/tdiesler/trunk/.project
stack/metro/branches/tdiesler/trunk/modules/management/pom.xml
stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html
stack/metro/branches/tdiesler/trunk/src/
Log:
Property changes on: stack/metro/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
+ output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
.settings
Modified: stack/metro/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 08:09:00 UTC (rev 6738)
+++ stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 08:40:46 UTC (rev 6739)
@@ -1,28 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" output="target-eclipse/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target-eclipse/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="maven.type" value="test"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/>
- <classpathentry kind="lib" path="thirdparty/http.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/>
- <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
- <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/>
- <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/junit.jar"/>
- <classpathentry kind="output" path="output/eclipse"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target-eclipse/classes"/>
</classpath>
Modified: stack/metro/branches/tdiesler/trunk/.project
===================================================================
--- stack/metro/branches/tdiesler/trunk/.project 2008-04-29 08:09:00 UTC (rev 6738)
+++ stack/metro/branches/tdiesler/trunk/.project 2008-04-29 08:40:46 UTC (rev 6739)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>stack-metro</name>
+ <name>stack-metro-mvn</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Copied: stack/metro/branches/tdiesler/trunk/modules/client/pom.xml (from rev 6729, stack/cxf/trunk/modules/client/pom.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 08:40:46 UTC (rev 6739)
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Runtime Client</name>
+ <artifactId>jbossws-metro-client</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+
+ <!-- Metro dependencies -->
+
+ <!--
+ useStrictFiltering requires dependency in all included modules
+ http://jira.codehaus.org/browse/MASSEMBLY-317
+ -->
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ </dependency>
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Copied: stack/metro/branches/tdiesler/trunk/modules/management (from rev 6729, stack/cxf/trunk/modules/management)
Modified: stack/metro/branches/tdiesler/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-29 08:40:46 UTC (rev 6739)
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack CXF Management</name>
- <artifactId>jbossws-cxf-management</artifactId>
+ <name>JBoss Web Services - Stack Metro Management</name>
+ <artifactId>jbossws-metro-management</artifactId>
<packaging>war</packaging>
<parent>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-cxf</artifactId>
+ <artifactId>jbossws-metro</artifactId>
<version>3.0.2-SNAPSHOT</version>
</parent>
Modified: stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/cxf/trunk/modules/management/src/main/webapp/index.html 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html 2008-04-29 08:40:46 UTC (rev 6739)
@@ -46,7 +46,7 @@
<fieldset>
<legend><b>Community</b></legend>
<ul>
- <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=275">User forum</a></li>
<li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
<li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
</ul>
Copied: stack/metro/branches/tdiesler/trunk/modules/server/pom.xml (from rev 6729, stack/cxf/trunk/modules/server/pom.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 08:40:46 UTC (rev 6739)
@@ -0,0 +1,165 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Runtime Server</name>
+ <artifactId>jbossws-metro-server</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- Metro dependencies -->
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+
+ <!-- transitve dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>src/main/resources/jbossws-metro-server.jar</directory>
+ </resource>
+ <resource>
+ <targetPath>../resources/jbossws-metro.sar</targetPath>
+ <directory>src/main/resources/jbossws-metro.sar</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/>
+ <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/>
+ <ant antfile="src/main/scripts/antrun-beans-config.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: stack/metro/branches/tdiesler/trunk/modules/server/src/main/java (from rev 6734, stack/metro/branches/tdiesler/trunk/src/main/java)
Added: stack/metro/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/pom.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 08:40:46 UTC (rev 6739)
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+ The JBossWS project is organised like this
+
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+
+ Target Container: | AS-5.0 | | AS-4.2 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ WS Framework: | jbossws-spi, jbossws-framework, jbossws-common | | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack Integration: | jbossws-native | | jbossws-metro | | jbossws-cxf | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack: | jbossws-core | | Sun Metro | | Apache Metro | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
+ JAXWS Testsuite
+
+
+ Typically you would build, deploy, test one of the WS stacks against one of the supported target containers.
+ Here we explain first the manual procedure. Further down you find instruction on how to do this using our
+ automated Hudson QA environment.
+
+ Working with JBossWS
+ ~~~~~~~~~~~~~~~~~~~~
+
+ To run the general JAXWS samples against our web service stack on JBoss-5.0 you would run the sequence below.
+ This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly.
+
+ ant deploy-jboss500
+ mvn -Ptestsuite,jboss500 test
+
+ Working with the Hudson QA environment
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ The Hudson QA environment helps you to test any supported stack against any supported target container.
+ To setup Hudson on your local box, you would run
+
+ cd framework/trunk/hudson
+ ant hudson-setup
+ ant hudson-start
+
+ When you hit http://localhost:8180/hudson you should be able to
+
+ 1. login
+ 2. build a target container
+ 3. run a testsuite against the target container
+
+ Publicly, Hudson is available at http://jbws.dyndns.org:8180/hudson/
+
+ Have fun + good luck
+ The JBossWS Team
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <packaging>pom</packaging>
+
+ <version>3.0.2-SNAPSHOT</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Modules - ->
+ <modules>
+ <module>modules/management</module>
+ <module>modules/server</module>
+ <module>modules/client</module>
+ </modules-->
+
+ <!-- Properties -->
+ <properties>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version>
+ <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version>
+ <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxrpc.api.version>1.1</jaxrpc.api.version>
+ <juddi.service.version>1.2.0.GA</juddi.service.version>
+ <sun.jaxws.version>2.1.3</sun.jaxws.version>
+ </properties>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${jbossws.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- provided apis -->
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Metro dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${sun.jaxws.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- transitve dependencies -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>${juddi.service.version}</version>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>container</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>container</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate-jboss-home</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo/>
+ <echo message="profile=${jbossws.integration.target}"/>
+ <echo message="jboss.home=${jboss.home}"/>
+ <echo/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>deploy-artifacts</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <!--
+ Cannot bind to lifecycle with multiple modules
+ http://jira.codehaus.org/browse/MASSEMBLY-319
+ <executions>
+ <execution>
+ <id>build-deploy-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions-->
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+ <!--
+ Name: bindist
+ Descr: Build the binary distribution
+ -->
+ <profile>
+ <id>bindist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>jbossws-metro-dist</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <properties>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ <jboss.home>${jboss422.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <properties>
+ <jbossws.integration.target>jboss423</jbossws.integration.target>
+ <jboss.home>${jboss423.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <properties>
+ <jbossws.integration.target>jboss500</jbossws.integration.target>
+ <jboss.home>${jboss500.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.home>${jboss501.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: testsuite
+ Descr: Executes the testsuite
+ -->
+ <profile>
+ <id>testsuite</id>
+ <modules>
+ <module>modules/testsuite</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>maven2.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: stack/metro/branches/tdiesler/trunk/src
___________________________________________________________________
Name: svn:externals
- test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/testsuite/test
17 years, 12 months
JBossWS SVN: r6738 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-04-29 04:09:00 -0400 (Tue, 29 Apr 2008)
New Revision: 6738
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2028] Excluding test since the prj generator is not available yet in CXF stack
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 08:08:29 UTC (rev 6737)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 08:09:00 UTC (rev 6738)
@@ -95,3 +95,6 @@
# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 08:08:29 UTC (rev 6737)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 08:09:00 UTC (rev 6738)
@@ -95,3 +95,6 @@
# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 08:08:29 UTC (rev 6737)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 08:09:00 UTC (rev 6738)
@@ -101,3 +101,6 @@
# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 08:08:29 UTC (rev 6737)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 08:09:00 UTC (rev 6738)
@@ -116,3 +116,6 @@
org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/samples/webservice/**
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
17 years, 12 months
JBossWS SVN: r6737 - stack/metro/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-04-29 04:08:29 -0400 (Tue, 29 Apr 2008)
New Revision: 6737
Modified:
stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2028] Excluding test since the prj generator is not available yet in Metro stack
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-29 07:57:47 UTC (rev 6736)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-29 08:08:29 UTC (rev 6737)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-29 07:57:47 UTC (rev 6736)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-29 08:08:29 UTC (rev 6737)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-29 07:57:47 UTC (rev 6736)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-29 08:08:29 UTC (rev 6737)
@@ -84,4 +84,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-29 07:57:47 UTC (rev 6736)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-29 08:08:29 UTC (rev 6737)
@@ -99,3 +99,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
17 years, 12 months