JBossWS SVN: r12064 - legacy/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-21 04:19:38 -0400 (Wed, 21 Apr 2010)
New Revision: 12064
Added:
legacy/tags/jbossws-1.2.1.GA_CP06/
Log:
[JBPAPP-4137] tagging JBossWS 1.2.1.GA_CP06
Copied: legacy/tags/jbossws-1.2.1.GA_CP06 (from rev 12063, legacy/branches/jbossws-1.2.1.GA_CP)
14 years
JBossWS SVN: r12063 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-21 02:05:35 -0400 (Wed, 21 Apr 2010)
New Revision: 12063
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-excludes.txt
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt
Log:
[JBPAPP-4099] excluding transiently failing tests - JAX-WS isn't supported with EAP42, so excluding it it's not a problem
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-excludes.txt
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2010-04-21 05:24:04 UTC (rev 12062)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2010-04-21 06:05:35 UTC (rev 12063)
@@ -8,3 +8,6 @@
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/jbws1581/**
org/jboss/test/ws/jaxws/serviceref/**
+
+# Disabling transient failures
+org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase.*
\ No newline at end of file
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2010-04-21 05:24:04 UTC (rev 12062)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2010-04-21 06:05:35 UTC (rev 12063)
@@ -17,3 +17,5 @@
org/jboss/test/ws/jaxws/samples/xop/**
org/jboss/test/ws/jaxws/serviceref/**
+# Disabling transient failures
+org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase.*
14 years
JBossWS SVN: r12062 - framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-21 01:24:04 -0400 (Wed, 21 Apr 2010)
New Revision: 12062
Modified:
framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
Log:
[JBWS-2791]:register jms endpoints
Modified: framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-04-21 04:41:54 UTC (rev 12061)
+++ framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-04-21 05:24:04 UTC (rev 12062)
@@ -22,12 +22,18 @@
package org.jboss.wsf.framework.deployment;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.metadata.endpoints.EndpointMetaData;
+import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
+import org.jboss.wsf.spi.metadata.endpoints.jms.JMSAddressMetaData;
+import org.jboss.wsf.spi.metadata.endpoints.jms.JMSDestinationMetaData;
/**
* A deployer that registers the endpoints
@@ -43,10 +49,52 @@
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
if (registry == null)
registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+
+ if (WSHelper.hasEndpointsDeployment(dep))
+ {
+ DeploymentModelFactory deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+ EndpointsMetaData endpointsMD = WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class);
+ for(EndpointMetaData endpointMD : endpointsMD.getEndpointsMetaData())
+ {
+ Endpoint endpoint = deploymentModelFactory.newEndpoint(endpointMD.getImplementor());
+ endpoint.setShortName(dep.getSimpleName());
+
+ if (endpointMD.getAddressMetaData() instanceof JMSAddressMetaData)
+ {
+ StringBuffer address = new StringBuffer("jms:");
+ JMSAddressMetaData jmsAddressMetaData = (JMSAddressMetaData)endpointMD.getAddressMetaData();
+ JMSDestinationMetaData request = jmsAddressMetaData.getRequestDestination();
+ if (request.getProperty("jndiDestinationName") != null)
+ {
+ address.append("jndi:" + request.getProperty("jndiDestinationName"));
+ }
+ else if (request.getProperty("jmsDestinationName") != null)
+ {
+ address.append("jndi:" + request.getProperty("jmsDestinationName"));
+ }
+
+ JMSDestinationMetaData reply = jmsAddressMetaData.getReplyDestination();
+ if (reply.getProperty("jndiDestinationName") != null)
+ {
+ address.append("?replyToName =" + reply.getProperty("jndiReplyDestinationName"));
+ }
+ else if (reply.getProperty("jmsDestinationName") != null)
+ {
+ address.append("?replyToName =" + reply.getProperty("jmsReplyDestinationName"));
+ }
+
+
+ endpoint.setAddress(address.toString());
+ registry.register(endpoint);
+ }
+ }
+ }
+
for (Endpoint ep : dep.getService().getEndpoints())
{
registry.register(ep);
}
+
}
public void stop(Deployment dep)
14 years
JBossWS SVN: r12061 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-21 00:41:54 -0400 (Wed, 21 Apr 2010)
New Revision: 12061
Added:
framework/branches/jms-integration/
Log:
Jms integration branch
Copied: framework/branches/jms-integration (from rev 12060, framework/trunk)
14 years
JBossWS SVN: r12060 - in stack/cxf/branches/jms-integration/modules/server/src/main: java/org/jboss/wsf/stack/cxf/deployment/aspect and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-20 23:10:21 -0400 (Tue, 20 Apr 2010)
New Revision: 12060
Added:
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java
Modified:
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
Log:
[JBWS-2791]:Added DAs to deploy jms endpoints
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-04-21 03:03:47 UTC (rev 12059)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-04-21 03:10:21 UTC (rev 12060)
@@ -165,8 +165,23 @@
protected void createBus(URL location)
{
bus = new SpringBusFactory().createBus();
- ctx = bus.getExtension(BusApplicationContext.class);
- //Load additional configurations from cxf-servlet.xml
+ loadCXFConfig (bus, location);
+ //Force servlet transport to prevent CXF from using Jetty as a transport
+ DestinationFactory factory = new ServletTransportFactory(bus);
+ for (String s : factory.getTransportIds()) {
+ registerTransport(factory, s);
+ }
+ }
+
+ /**Load CXF spring beans definition
+ *
+ * @param bus CXF Bus
+ * @param location Srping style cxf configuraiton xml
+ */
+ public void loadCXFConfig(Bus bus, URL location) {
+
+ ApplicationContext ctx = bus.getExtension(BusApplicationContext.class);
+
if (location != null)
{
try
@@ -179,13 +194,9 @@
log.trace("Could not load additional config from location: " + location, e);
}
}
- //Force servlet transport to prevent CXF from using Jetty as a transport
- DestinationFactory factory = new ServletTransportFactory(bus);
- for (String s : factory.getTransportIds()) {
- registerTransport(factory, s);
- }
}
+
protected static void setResourceResolver(Bus bus, ResourceResolver resourceResolver)
{
if (resourceResolver != null)
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-04-21 03:03:47 UTC (rev 12059)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-04-21 03:10:21 UTC (rev 12060)
@@ -25,9 +25,12 @@
import java.net.URL;
import java.util.Map;
+import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
+import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -51,7 +54,7 @@
@Override
public void start(Deployment dep)
{
- BusHolder holder;
+ BusHolder holder = null;
ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
try
{
@@ -59,30 +62,57 @@
//set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
+ Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
+
ResourceResolver deploymentResolver = aDep.getResourceResolver();
-
- URL cxfServletURL = null;
- try
+ org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
+
+ if (contextParams != null)
{
- cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml");
- }
- catch (IOException e)
- {
- } //ignore, cxf-servlet.xml is optional, we might even decide not to support this
+
- holder = BusHolder.create(cxfServletURL);
+ URL cxfServletURL = null;
+ try
+ {
+ cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml");
+ }
+ catch (IOException e)
+ {
+ } //ignore, cxf-servlet.xml is optional, we might even decide not to support this
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
- try
- {
- URL jbossCxfXml = deploymentResolver.resolve(contextParams.get(BusHolder.PARAM_CXF_BEANS_URL));
- org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
- JBossWSCXFConfigurer configurer = holder.createConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep));
- holder.configure(jbossCxfXml, new SoapTransportFactoryExt(), resolver, configurer);
+ holder = BusHolder.create(cxfServletURL);
+
+ try
+ {
+ URL jbossCxfXml = deploymentResolver.resolve(contextParams.get(BusHolder.PARAM_CXF_BEANS_URL));
+
+ JBossWSCXFConfigurer configurer = holder.createConfigurer(dep.getAttachment(BindingCustomization.class),
+ new WSDLFilePublisher(aDep));
+ holder.configure(jbossCxfXml, new SoapTransportFactoryExt(), resolver, configurer);
+
+ //if there is jbossws endpoints deployment descriptor
+ if (WSHelper.hasEndpointsDeployment(dep) && dep.getProperty(BusHolder.PARAM_CXF_BEANS_URL) != null)
+ {
+ URL url = (URL) dep.getProperty(BusHolder.PARAM_CXF_BEANS_URL);
+ holder.loadCXFConfig(holder.getBus(), url);
+ }
+
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required
+ }
}
- catch (IOException e)
+
+ if (contextParams == null && WSHelper.hasEndpointsDeployment(dep))
{
- throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required
+ //TODO:BusHolder needs refactor to createBus automatically or getDefaultBus
+ URL tmp = null;
+ //holder = BusHolder.create(url);
+ //Bus bus = new SpringBusFactory().createBus();
+ if (holder == null) holder = BusHolder.create(tmp);
+ URL url = (URL)dep.getProperty(BusHolder.PARAM_CXF_BEANS_URL);
+ holder.loadCXFConfig(holder.getBus(), url);
}
}
finally
Added: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java 2010-04-21 03:10:21 UTC (rev 12060)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.cxf.deployment.aspect;
+
+import java.net.URL;
+
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.endpoints.EndpointMetaData;
+import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
+import org.jboss.wsf.spi.metadata.endpoints.jms.JMSAddressMetaData;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
+import org.jboss.wsf.stack.cxf.metadata.services.DDJmsAddressBean;
+
+/**
+ * To convert the EndpointsMetaData to cxf deployment spring style xml
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class EndpointsDescriptorDeploymentAspect extends AbstractDeploymentAspect
+{
+ @Override
+ public void start(Deployment dep)
+ {
+ if (WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) != null)
+ {
+ URL url = this.generateCXFDeploymentDescriptor(dep);
+ dep.setProperty(BusHolder.PARAM_CXF_BEANS_URL, url);
+ }
+ }
+
+ @Override
+ public void stop(Deployment dep)
+ {
+ dep.removeProperty(BusHolder.PARAM_CXF_BEANS_URL);
+ }
+
+ @Override
+ public boolean canHandle(Deployment dep)
+ {
+ if (WSHelper.isJaxrpcDeployment(dep))
+ {
+ return false;
+ }
+ else
+ {
+ return WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) == null ? false : true;
+ }
+ }
+
+ private URL generateCXFDeploymentDescriptor(Deployment dep)
+ {
+ DDBeans ddBeans = new DDBeans();
+ EndpointsMetaData endpoints = WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class);
+ for (EndpointMetaData endpointMD : endpoints.getEndpointsMetaData())
+ {
+ DDEndpoint endpointBean = new DDEndpoint(dep.getSimpleName(), endpointMD.getImplementor());
+ ddBeans.addEndpoint(endpointBean);
+ if (endpointMD.getAddressMetaData() != null && endpointMD.getAddressMetaData() instanceof JMSAddressMetaData)
+ {
+ JMSAddressMetaData jmsMD = (JMSAddressMetaData) endpointMD.getAddressMetaData();
+ endpointBean.setTransportId("http://cxf.apache.org/transports/jms");
+ if (jmsMD.getRequestDestination() != null)
+ {
+ DDJmsAddressBean addressBean = new DDJmsAddressBean(jmsMD.getPortName(), true, jmsMD
+ .getReplyDestination().getProperties());
+ ddBeans.addAddress(addressBean);
+ }
+
+ if (jmsMD.getReplyDestination() != null)
+ {
+ DDJmsAddressBean addressBean = new DDJmsAddressBean(jmsMD.getPortName(), false, jmsMD
+ .getReplyDestination().getProperties());
+ ddBeans.addAddress(addressBean);
+ }
+ }
+ }
+ URL url = ddBeans.createFileURL();
+ return url;
+
+ }
+}
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-04-21 03:03:47 UTC (rev 12059)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-04-21 03:10:21 UTC (rev 12060)
@@ -45,6 +45,9 @@
private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>();
// Optional additional beans.
private List<DDBean> beans = new ArrayList<DDBean>();
+
+ private List<DDJmsAddressBean> addressBeans = new ArrayList<DDJmsAddressBean>();
+
// The derived temp file
private File tmpFile;
@@ -57,6 +60,11 @@
{
endpoints.add(service);
}
+
+ public void addAddress(DDJmsAddressBean addressBean)
+ {
+ addressBeans.add(addressBean);
+ }
public List<DDBean> getBeans()
{
@@ -104,9 +112,12 @@
"xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " +
"xmlns:beans='http://www.springframework.org/schema/beans' " +
"xmlns:jaxws='http://cxf.apache.org/jaxws' " +
+ "xmlns:jms='http://cxf.apache.org/transports/jms' " +
"xmlns:soap='http://cxf.apache.org/bindings/soap' " +
"xsi:schemaLocation='http://www.springframework.org/schema/beans " +
"http://www.springframework.org/schema/beans/spring-beans.xsd " +
+ "http://cxf.apache.org/transports/jms " +
+ "http://cxf.apache.org/schemas/configuration/jms.xsd " +
"http://cxf.apache.org/jaxws " +
"http://cxf.apache.org/schemas/jaxws.xsd'>");
@@ -118,6 +129,10 @@
{
bean.writeTo(writer);
}
+
+ for (DDJmsAddressBean bean : this.addressBeans) {
+ bean.writeTo(writer);
+ }
writer.write("</beans>");
}
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-04-21 03:03:47 UTC (rev 12059)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-04-21 03:10:21 UTC (rev 12060)
@@ -36,6 +36,8 @@
private String address;
private String implementor;
private String invoker;
+ private String transportId;
+
private boolean mtomEnabled;
public DDEndpoint(String id, String address, String implementor, boolean mtomEnabled)
@@ -45,6 +47,12 @@
this.implementor = implementor;
this.mtomEnabled = mtomEnabled;
}
+
+ public DDEndpoint(String id, String implementor)
+ {
+ this.id = id;
+ this.implementor = implementor;
+ }
public void setInvoker(String invoker)
{
@@ -54,8 +62,17 @@
public void writeTo(Writer writer) throws IOException
{
writer.write("<jaxws:endpoint id='" + this.id + "'");
- writer.write(" address='" + this.address + "'");
+ if (address != null)
+ {
+ writer.write(" address='" + this.address + "'");
+ }
writer.write(" implementor='" + this.implementor + "'");
+
+ if (transportId != null)
+ {
+ writer.write(" transportId='" + this.transportId + "'");
+ }
+
writer.write(">");
if (this.mtomEnabled)
@@ -73,6 +90,12 @@
writer.write("</jaxws:endpoint>");
}
+
+ public void setTransportId(String transportId)
+ {
+ this.transportId = transportId;
+ }
+
public String toString()
{
StringBuilder str = new StringBuilder("Service");
@@ -81,6 +104,7 @@
str.append("\n implementor=" + this.implementor);
str.append("\n invoker=" + this.invoker);
str.append("\n mtomEnabled=" + this.mtomEnabled);
+ str.append("\n transportId=" + this.transportId);
return str.toString();
}
}
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2010-04-21 03:03:47 UTC (rev 12059)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2010-04-21 03:10:21 UTC (rev 12060)
@@ -45,6 +45,15 @@
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
+
+
+ <bean name="EndpointsDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.EndpointsDescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress,JAXBIntros</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ <property name="processEndpointDeployment">true</property>
+ </bean>
+
<bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
@@ -80,6 +89,7 @@
<property name="provides">BusHolder</property>
<property name="requires">ResourceResolver,StackDescriptor</property>
<property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround -->
+ <property name="processEndpointDeployment">true</property>
</bean>
</deployment>
14 years
JBossWS SVN: r12059 - common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-20 23:03:47 -0400 (Tue, 20 Apr 2010)
New Revision: 12059
Modified:
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
Log:
[JBWS-2791]:modified AbstractDeploymentAspect.canHandle() to take into account jms endpoints deployment descriptor;Added utitily method to check if the spi depoyment containsjms endpoints deployment
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-04-21 02:46:17 UTC (rev 12058)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-04-21 03:03:47 UTC (rev 12059)
@@ -48,6 +48,7 @@
private boolean isLast;
private boolean isForJaxWs = true;
private boolean isForJaxRpc = true;
+ private boolean processEndpointDeployment = false;
private WeakReference<ClassLoader> loader;
public AbstractDeploymentAspect()
@@ -135,9 +136,20 @@
public boolean canHandle(Deployment dep)
{
return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) ||
- this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep));
+ this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep)
+ || this.isForJaxWs && processEndpointDeployment);
}
+ public boolean isProcessEndpointDeployment()
+ {
+ return processEndpointDeployment;
+ }
+
+ public void setProcessEndpointDeployment(boolean processEndpointDeployment)
+ {
+ this.processEndpointDeployment = processEndpointDeployment;
+ }
+
public boolean isForJaxWs()
{
return isForJaxWs;
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-04-21 02:46:17 UTC (rev 12058)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-04-21 03:03:47 UTC (rev 12059)
@@ -24,6 +24,7 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
/**
* Cross WS stack and JBoss AS integration helper.
@@ -189,5 +190,10 @@
return isJaxrpcEjb || isJaxrpcJse;
}
+
+ public static boolean hasEndpointsDeployment(final Deployment dep)
+ {
+ return WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class) != null ? true : false;
+ }
}
14 years
JBossWS SVN: r12058 - in container/jboss50/branches/jbossws-jboss510-jms-integration/src/main: resources/jbossws-jboss.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-20 22:46:17 -0400 (Tue, 20 Apr 2010)
New Revision: 12058
Modified:
container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2791]:Build spi deployment for endpoints deployment descriptor
Modified: container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-04-21 02:42:37 UTC (rev 12057)
+++ container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-04-21 02:46:17 UTC (rev 12058)
@@ -97,6 +97,8 @@
EndpointsMetaData endpointsMetaData = ASHelper.getRequiredAttachment(unit, EndpointsMetaData.class);
dep.addAttachment(EndpointsMetaData.class, endpointsMetaData);
+ dep.setRuntimeClassLoader(unit.getClassLoader());
+ unit.addAttachment(Deployment.class, dep);
}
}
@@ -105,8 +107,7 @@
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
DeploymentModelFactory deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
Deployment dep = deploymentModelFactory.newDeployment(unit.getSimpleName(), unit.getClassLoader());
- //There is no SPI Service and Endpoint created and also there is no DeploymentType
- //TODO:Review it if add deploymentType can make things easy
+ //There is no SPI Endpoint created and also there is no DeploymentType
return dep;
}
}
Modified: container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-04-21 02:42:37 UTC (rev 12057)
+++ container/jboss50/branches/jbossws-jboss510-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-04-21 02:46:17 UTC (rev 12058)
@@ -141,6 +141,7 @@
<property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
<property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
+ <property name="processEndpointDeployment">true</property>
</bean>
<bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect">
14 years
JBossWS SVN: r12057 - in spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints: jms and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-20 22:42:37 -0400 (Tue, 20 Apr 2010)
New Revision: 12057
Modified:
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java
Log:
[JBWS-2791]:Refactored code
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java 2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java 2010-04-21 02:42:37 UTC (rev 12057)
@@ -63,7 +63,7 @@
return addressMetaData;
}
- public EndpointsMetaData getEndpointsMetaData()
+ public EndpointsMetaData getParentMetaData()
{
return endpointsMetaData;
}
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java 2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java 2010-04-21 02:42:37 UTC (rev 12057)
@@ -179,7 +179,9 @@
if (JMSAddressMetaData.NAMESPACE_URI.equals(namespaceURI)
&& JMSAddressMetaData.ADDRESS_LOCAL_NAME.equals(localName))
{
- return new JMSAddressMetaData(endpoint);
+ JMSAddressMetaData jmsMetaData = new JMSAddressMetaData(endpoint);
+ jmsMetaData.setPortName(attrs.getValue("portName"));
+ return jmsMetaData;
}
else
@@ -204,14 +206,12 @@
if ("requestDestination".equals(localName))
{
JMSDestinationMetaData requestDest = new JMSDestinationMetaData();
- requestDest.setName(attrs.getValue("name"));
jmsAddress.setRequestDestination(requestDest);
return requestDest;
}
else if ("replyDestination".equals(localName))
{
JMSDestinationMetaData replyDest = new JMSDestinationMetaData();
- replyDest.setName(attrs.getValue("name"));
jmsAddress.setReplyDestination(replyDest);
return replyDest;
}
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java 2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java 2010-04-21 02:42:37 UTC (rev 12057)
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.ArrayList;
+import java.util.List;
/**
* <p>Stack independent top level meta data class from jbossws-endpoints.xml. </p>
@@ -55,7 +56,7 @@
public class EndpointsMetaData
{
//The endpoints list
- private ArrayList<EndpointMetaData> endpointsMetaData = new ArrayList<EndpointMetaData>();
+ private List<EndpointMetaData> endpointsMetaData = new ArrayList<EndpointMetaData>();
//The jbossws-endpoint.xml location
private URL descriptorURL;
@@ -78,4 +79,8 @@
{
endpointsMetaData.add(endpointMetaData);
}
+
+ public List<EndpointMetaData> getEndpointsMetaData() {
+ return this.endpointsMetaData;
+ }
}
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java 2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java 2010-04-21 02:42:37 UTC (rev 12057)
@@ -40,6 +40,8 @@
private JMSDestinationMetaData requestDestination;
private JMSDestinationMetaData replyDestination;
+
+ private String portName= "";
public JMSAddressMetaData(EndpointMetaData endpoint)
{
@@ -70,4 +72,14 @@
{
this.requestDestination = requestDestination;
}
+
+ public String getPortName()
+ {
+ return portName;
+ }
+
+ public void setPortName(String portName)
+ {
+ this.portName = portName;
+ }
}
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java 2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java 2010-04-21 02:42:37 UTC (rev 12057)
@@ -30,8 +30,6 @@
*/
public class JMSDestinationMetaData
{
- private String name;
-
private Properties properties = new Properties();;
public JMSDestinationMetaData()
@@ -39,16 +37,6 @@
}
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
public void setProperty(String name, String value)
{
properties.put(name, value);
14 years
JBossWS SVN: r12056 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-20 16:19:42 -0400 (Tue, 20 Apr 2010)
New Revision: 12056
Modified:
stack/native/trunk/pom.xml
Log:
Moving to latest jbossws maven parent
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
+++ stack/native/trunk/pom.xml 2010-04-20 20:19:42 UTC (rev 12056)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.5.GA</version>
</parent>
<!-- Source Control Management -->
14 years
JBossWS SVN: r12055 - in stack/native/tags/jbossws-native-3.3.0.CR2: modules/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-20 16:18:20 -0400 (Tue, 20 Apr 2010)
New Revision: 12055
Modified:
stack/native/tags/jbossws-native-3.3.0.CR2/modules/client/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/core/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/endorsed/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/management/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/resources/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/services/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/framework-tests/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-3.3.0.CR2/pom.xml
Log:
Updating pom.xml files
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/client/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/client/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/core/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/core/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/endorsed/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/endorsed/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/endorsed/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/management/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/management/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/resources/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/resources/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/services/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/services/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/services/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/framework-tests/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/framework-tests/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/native-tests/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/native-tests/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/modules/testsuite/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.3.0.CR2/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR2/pom.xml 2010-04-20 19:02:30 UTC (rev 12054)
+++ stack/native/tags/jbossws-native-3.3.0.CR2/pom.xml 2010-04-20 20:18:20 UTC (rev 12055)
@@ -17,20 +17,20 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.0.CR2</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.5.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
@@ -45,12 +45,12 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>
+ <jbossws.spi.version>1.3.0.CR2</jbossws.spi.version>
+ <jbossws.common.version>1.3.0.CR2</jbossws.common.version>
+ <jbossws.framework.version>3.3.0.CR2</jbossws.framework.version>
+ <jbossws.jboss501.version>3.3.0.CR1</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.3.0.CR1</jbossws.jboss510.version>
+ <jbossws.jboss600M2.version>3.3.0.CR1</jbossws.jboss600M2.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
14 years