JBossWS SVN: r11813 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-19 05:54:59 -0400 (Fri, 19 Mar 2010)
New Revision: 11813
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
Log:
[JBWS-2968] removing most of compilation warnings
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java 2010-03-19 09:41:01 UTC (rev 11812)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/HandlerResolverImpl.java 2010-03-19 09:54:59 UTC (rev 11813)
@@ -311,7 +311,7 @@
{
File file = new File(filename);
if (file.exists())
- fileURL = file.toURL();
+ fileURL = file.toURI().toURL();
}
catch (MalformedURLException e)
{
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2010-03-19 09:41:01 UTC (rev 11812)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2010-03-19 09:54:59 UTC (rev 11813)
@@ -30,6 +30,7 @@
import org.apache.cxf.tools.java2ws.JavaToWS;
import org.jboss.ws.tools.io.NullPrintStream;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.spi.tools.WSContractProvider;
import org.w3c.dom.Element;
@@ -250,12 +251,12 @@
+ "</log4j:configuration>";
try
{
- Element element = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new java.io.StringBufferInputStream(xmlConfig)).getDocumentElement();
+ Element element = DOMUtils.parse(xmlConfig);
org.apache.log4j.xml.DOMConfigurator.configure(element);
}
catch (Exception e)
{
- //igonre
+ //ignore
}
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-03-19 09:41:01 UTC (rev 11812)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-03-19 09:54:59 UTC (rev 11813)
@@ -80,7 +80,7 @@
writeTo(writer);
writer.close();
- return tmpFile.toURL();
+ return tmpFile.toURI().toURL();
}
catch (IOException ex)
{
14 years, 9 months
JBossWS SVN: r11812 - in framework/trunk: src/main/java/org/jboss/wsf/framework/serviceref and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-19 05:41:01 -0400 (Fri, 19 Mar 2010)
New Revision: 11812
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2968] removing most of compilation warnings
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -40,8 +40,8 @@
public void start(Endpoint ep)
{
- if (log.isDebugEnabled())
- log.debug("Start: " + ep.getName());
+ if (log.isTraceEnabled())
+ log.trace("Start: " + ep.getName());
EndpointState state = ep.getState();
if (state != EndpointState.UNDEFINED)
@@ -64,8 +64,8 @@
public void stop(Endpoint ep)
{
- if (log.isDebugEnabled())
- log.debug("Stop: " + ep.getName());
+ if (log.isTraceEnabled())
+ log.trace("Stop: " + ep.getName());
EndpointState state = ep.getState();
if (state != EndpointState.STARTED)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -78,14 +78,14 @@
depAspects.clear();
depAspects.addAll(aspects);
- if (log.isDebugEnabled())
+ if (log.isTraceEnabled())
{
// Debug the aspect list
StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name);
for (DeploymentAspect aspect : aspects)
builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet());
- log.debug(builder);
+ log.trace(builder);
}
}
@@ -166,10 +166,12 @@
private void logInvocation(DeploymentAspect aspect, String method)
{
- String name = aspect.getClass().getName();
- name = name.substring(name.lastIndexOf(".") + 1);
- if (log.isDebugEnabled())
- log.debug("[" + this.name + "]" + name + ":" + method);
+ if (log.isTraceEnabled())
+ {
+ String name = aspect.getClass().getName();
+ name = name.substring(name.lastIndexOf(".") + 1);
+ log.trace("[" + this.name + "]" + name + ":" + method);
+ }
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -51,8 +51,8 @@
// assert ArchiveDeployment
if(! (deployment instanceof ArchiveDeployment) )
{
- if (log.isDebugEnabled())
- log.debug("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass());
+ if (log.isTraceEnabled())
+ log.trace("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass());
return;
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -84,8 +84,8 @@
}
else
{
- if (log.isDebugEnabled())
- log.debug("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e);
+ if (log.isTraceEnabled())
+ log.trace("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e);
}
}
}
@@ -112,8 +112,8 @@
}
catch (IOException e)
{
- if (log.isDebugEnabled())
- log.debug("Cannot get " + resourcePath + " from " + uvf, e);
+ if (log.isTraceEnabled())
+ log.trace("Cannot get " + resourcePath + " from " + uvf, e);
}
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -108,7 +108,7 @@
// update the rootFile
try
{
- vfsRoot = new URLLoaderAdapter(expandedDirectory.toURL());
+ vfsRoot = new URLLoaderAdapter(expandedDirectory.toURI().toURL());
}
catch (MalformedURLException e)
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -21,17 +21,10 @@
*/
package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesRPCTest;
import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC;
-import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-
/**
* @author pmacik(a)redhat.com
* @since 09-Mar-2010
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -37,8 +37,6 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
-
/**
* A complex JAX-WS test
*
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -88,7 +88,7 @@
String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
executeCommand(command, "wsprovide");
- URL wsdlURL = new File(destDir, "JBWS2528EndpointService.wsdl").toURL();
+ URL wsdlURL = new File(destDir, "JBWS2528EndpointService.wsdl").toURI().toURL();
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
PortType portType = wsdlDefinition.getPortType(new QName("http://jbws2528.jaxws.ws.test.jboss.org/", "JBWS2528Endpoint"));
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -98,12 +98,12 @@
{
if( filtered(s) )
continue;
- jarURLs.add( new File(s).toURL() );
+ jarURLs.add( new File(s).toURI().toURL() );
jarURLString.append( s ).append(File.pathSeparator);
}
else
{
- classDirUrls.add( new File(s).toURL() );
+ classDirUrls.add( new File(s).toURI().toURL() );
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -359,7 +359,7 @@
private ClassLoader getArtefactClassLoader() throws Exception {
URLClassLoader loader = new URLClassLoader(
- new URL[] { outputDirectory.toURL() },
+ new URL[] { outputDirectory.toURI().toURL() },
Thread.currentThread().getContextClassLoader()
);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-03-19 09:24:06 UTC (rev 11811)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-03-19 09:41:01 UTC (rev 11812)
@@ -67,7 +67,7 @@
private ClassLoader getArtefactClassLoader() throws Exception {
URLClassLoader loader = new URLClassLoader(
- new URL[] { outputDirectory.toURL() },
+ new URL[] { outputDirectory.toURI().toURL() },
Thread.currentThread().getContextClassLoader()
);
14 years, 9 months
JBossWS SVN: r11811 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core: jaxws/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-03-19 05:24:06 -0400 (Fri, 19 Mar 2010)
New Revision: 11811
Added:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBPAPP-3948]:merged the ClassCastException fix(JBWS-2888) to branch
Added: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/EndpointMetadataProvider.java 2010-03-19 09:24:06 UTC (rev 11811)
@@ -0,0 +1,38 @@
+/*
+ * 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.ws.core;
+
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+
+/**
+ *
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 18-Jan-2010
+ */
+public interface EndpointMetadataProvider
+{
+ /**
+ * Get the endpoint meta data for this stub/dispatch
+ */
+ EndpointMetaData getEndpointMetaData();
+}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2010-03-19 09:19:28 UTC (rev 11810)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2010-03-19 09:24:06 UTC (rev 11811)
@@ -27,15 +27,13 @@
import javax.xml.rpc.ParameterMode;
import javax.xml.soap.AttachmentPart;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
/**
* An extension of the standard JAXRPC/JAXWS stubs.
*
* @author Thomas.Diesler(a)jboss.org
* @since 17-Jan-2007
*/
-public interface StubExt extends ConfigProvider
+public interface StubExt extends ConfigProvider, EndpointMetadataProvider
{
/** ClientTimeout property: org.jboss.ws.timeout */
static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout";
@@ -71,11 +69,6 @@
static final String PROPERTY_AUTH_TYPE_WSSE = "org.jboss.ws.authType.wsse";
/** Enable MTOM on the stub */
static final String PROPERTY_MTOM_ENABLED= "org.jboss.ws.mtom.enabled";
-
- /**
- * Get the endpoint meta data for this stub
- */
- EndpointMetaData getEndpointMetaData();
/**
* Add a header that is not bound to an input parameter.
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-03-19 09:19:28 UTC (rev 11810)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-03-19 09:24:06 UTC (rev 11811)
@@ -55,6 +55,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.ConfigProvider;
+import org.jboss.ws.core.EndpointMetadataProvider;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.client.EndpointInfo;
import org.jboss.ws.core.client.HTTPProtocolConnection;
@@ -88,7 +89,7 @@
* @author Thomas.Diesler(a)jboss.com
* @since 04-Jul-2006
*/
-public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider
+public class DispatchImpl<T> implements Dispatch<T>, ConfigProvider, EndpointMetadataProvider
{
// provide logging
private final Logger log = Logger.getLogger(DispatchImpl.class);
@@ -639,4 +640,9 @@
log.debug("Cannot find the right operation metadata!");
return opMetaData;
}
+
+ public EndpointMetaData getEndpointMetaData()
+ {
+ return epMetaData;
+ }
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-03-19 09:19:28 UTC (rev 11810)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-03-19 09:24:06 UTC (rev 11811)
@@ -54,6 +54,7 @@
import javax.xml.ws.spi.ServiceDelegate;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.EndpointMetadataProvider;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxws.client.ClientFeatureProcessor;
import org.jboss.ws.core.jaxws.client.ClientImpl;
@@ -558,7 +559,7 @@
{
if (features != null)
{
- EndpointMetaData epMetaData = ((StubExt)stub).getEndpointMetaData();
+ EndpointMetaData epMetaData = ((EndpointMetadataProvider)stub).getEndpointMetaData();
for (WebServiceFeature feature : features)
{
ClientFeatureProcessor.processFeature(feature, epMetaData, stub);
14 years, 9 months
JBossWS SVN: r11810 - in common/trunk/src/main/java/org/jboss: wsf/common and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-19 05:19:28 -0400 (Fri, 19 Mar 2010)
New Revision: 11810
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java
common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java
common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java
common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java
Log:
[JBWS-2968] removing most of compilation warnings
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -130,7 +130,7 @@
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
{
- if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]");
+ if(log.isTraceEnabled()) log.trace("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]");
InputSource inputSource = super.resolveEntity(publicId, systemId);
if (inputSource == null)
@@ -138,8 +138,7 @@
if (inputSource == null)
{
- if (log.isDebugEnabled())
- log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]");
+ log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]");
}
return inputSource;
Modified: common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -404,7 +404,7 @@
{
ClassLoader destLoader = dest.getClassLoader();
ClassLoader srcLoader = src.getClassLoader();
- if(log.isDebugEnabled()) log.debug("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader);
+ if(log.isTraceEnabled()) log.trace("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader);
}
if (isAssignable == false && isPrimitive(dest))
@@ -638,7 +638,7 @@
}
catch (Exception e)
{
- if(log.isDebugEnabled()) log.debug("Could not clear blacklists on " + loader);
+ if(log.isTraceEnabled()) log.trace("Could not clear blacklists on " + loader);
}
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -89,7 +89,7 @@
{
File file = new File(resourcePath);
if (file.exists())
- resourceURL = file.toURL();
+ resourceURL = file.toURI().toURL();
}
catch (MalformedURLException e)
{
@@ -203,7 +203,7 @@
{
for (File f : files)
{
- list.add(new ResourceLoaderAdapter(loader, f.toURL()));
+ list.add(new ResourceLoaderAdapter(loader, f.toURI().toURL()));
}
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -90,7 +90,7 @@
{
File file = new File(resourcePath);
if (file.exists())
- resourceURL = file.toURL();
+ resourceURL = file.toURI().toURL();
}
catch (MalformedURLException e)
{
@@ -216,7 +216,7 @@
{
for (File f : files)
{
- list.add(new URLLoaderAdapter(rootURL, loader, f.toURL()));
+ list.add(new URLLoaderAdapter(rootURL, loader, f.toURI().toURL()));
}
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -169,8 +169,8 @@
if (methods.size() > 0)
{
final Method method = methods.iterator().next();
- if (LOG.isDebugEnabled())
- LOG.debug("Calling @PostConstruct annotated method: " + method);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Calling @PostConstruct annotated method: " + method);
try
{
invokeMethod(instance, method, null);
@@ -200,8 +200,8 @@
if (methods.size() > 0)
{
final Method method = methods.iterator().next();
- if (LOG.isDebugEnabled())
- LOG.debug("Calling @PreDestroy annotated method: " + method);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Calling @PreDestroy annotated method: " + method);
try
{
invokeMethod(instance, method, null);
@@ -395,8 +395,8 @@
private static void inject(final Object instance, final Method method, final String jndiName, final Context ctx)
{
final Object value = lookup(jndiName, ctx);
- if (LOG.isDebugEnabled())
- LOG.debug("Injecting method: " + method);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Injecting method: " + method);
invokeMethod(instance, method, new Object[] {value});
}
@@ -411,8 +411,8 @@
private static void inject(final Object instance, final Field field, final String jndiName, final Context ctx)
{
final Object value = lookup(jndiName, ctx);
- if (LOG.isDebugEnabled())
- LOG.debug("Injecting field: " + field);
+ if (LOG.isTraceEnabled())
+ LOG.trace("Injecting field: " + field);
setField(instance, field, value);
}
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -66,7 +66,7 @@
{
if ( DEPLOY_PROCESS_ENABLED )
{
- URL archiveURL = getArchiveFile(archive).toURL();
+ URL archiveURL = getArchiveFile(archive).toURI().toURL();
getDeployer().deploy(archiveURL);
}
}
@@ -77,7 +77,7 @@
{
if ( DEPLOY_PROCESS_ENABLED )
{
- URL archiveURL = getArchiveFile(archive).toURL();
+ URL archiveURL = getArchiveFile(archive).toURI().toURL();
getDeployer().undeploy(archiveURL);
}
}
@@ -251,7 +251,7 @@
/** Try to discover the URL for the deployment archive */
public static URL getArchiveURL(String archive) throws MalformedURLException
{
- return getArchiveFile(archive).toURL();
+ return getArchiveFile(archive).toURI().toURL();
}
/** Try to discover the File for the deployment archive */
@@ -272,7 +272,7 @@
/** Try to discover the URL for the test resource */
public static URL getResourceURL(String resource) throws MalformedURLException
{
- return getResourceFile(resource).toURL();
+ return getResourceFile(resource).toURI().toURL();
}
/** Try to discover the File for the test resource */
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -77,7 +77,7 @@
public URL getArchiveURL(String archive) throws MalformedURLException
{
- return delegate.getArchiveFile(archive).toURL();
+ return delegate.getArchiveFile(archive).toURI().toURL();
}
public File getResourceFile(String resource)
@@ -87,7 +87,7 @@
public URL getResourceURL(String resource) throws MalformedURLException
{
- return delegate.getResourceFile(resource).toURL();
+ return delegate.getResourceFile(resource).toURI().toURL();
}
private void getArchiveArray(String archiveList)
Modified: common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2010-03-19 09:02:11 UTC (rev 11809)
+++ common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2010-03-19 09:19:28 UTC (rev 11810)
@@ -55,7 +55,7 @@
Image image = null;
try
{
- URL url = imgFile.toURL();
+ URL url = imgFile.toURI().toURL();
image = null;
try
@@ -84,7 +84,7 @@
{
try
{
- URL url = imgFile.toURL();
+ URL url = imgFile.toURI().toURL();
return new DataHandler(url);
}
catch (MalformedURLException e)
14 years, 9 months
JBossWS SVN: r11809 - in spi/trunk/src/main/java/org/jboss/wsf/spi: tools and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-19 05:02:11 -0400 (Fri, 19 Mar 2010)
New Revision: 11809
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java
Log:
[JBWS-2968] removing most of compilation warnings
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2010-03-18 21:34:08 UTC (rev 11808)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2010-03-19 09:02:11 UTC (rev 11809)
@@ -41,7 +41,7 @@
public static void pushGroupID(String groupID)
{
- if(log.isDebugEnabled()) log.debug("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
+ if(log.isTraceEnabled()) log.trace("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
Stack<String> stack = groupIDAssoc.get();
if (stack == null)
{
@@ -59,7 +59,7 @@
{
groupID = stack.peek();
}
- if(log.isDebugEnabled()) log.debug("peekGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
+ if(log.isTraceEnabled()) log.trace("peekGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
return groupID;
}
@@ -71,7 +71,7 @@
{
groupID = stack.pop();
}
- if(log.isDebugEnabled()) log.debug("popGroupID: " + groupID +" (Thread " +Thread.currentThread().getName()+ ")");
+ if(log.isTraceEnabled()) log.trace("popGroupID: " + groupID +" (Thread " +Thread.currentThread().getName()+ ")");
return groupID;
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2010-03-18 21:34:08 UTC (rev 11808)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2010-03-19 09:02:11 UTC (rev 11809)
@@ -204,7 +204,7 @@
catch (MalformedURLException e)
{
File file = new File(wsdl);
- url = file.toURL();
+ url = file.toURI().toURL();
}
consume(url);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2010-03-18 21:34:08 UTC (rev 11808)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2010-03-19 09:02:11 UTC (rev 11809)
@@ -190,7 +190,7 @@
catch (MalformedURLException e)
{
File file = new File(args[wsdlPos]);
- url = file.toURL();
+ url = file.toURI().toURL();
}
}
catch (MalformedURLException e)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2010-03-18 21:34:08 UTC (rev 11808)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2010-03-19 09:02:11 UTC (rev 11809)
@@ -219,7 +219,7 @@
{
try
{
- urls.add(new File(entry).toURL());
+ urls.add(new File(entry).toURI().toURL());
}
catch (MalformedURLException e)
{
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2010-03-18 21:34:08 UTC (rev 11808)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/URLLoaderAdapter.java 2010-03-19 09:02:11 UTC (rev 11809)
@@ -92,7 +92,7 @@
{
File file = new File(resourcePath);
if (file.exists())
- resourceURL = file.toURL();
+ resourceURL = file.toURI().toURL();
}
catch (MalformedURLException e)
{
@@ -218,7 +218,7 @@
{
for (File f : files)
{
- list.add(new URLLoaderAdapter(rootURL, loader, f.toURL()));
+ list.add(new URLLoaderAdapter(rootURL, loader, f.toURI().toURL()));
}
}
}
14 years, 9 months
JBossWS SVN: r11808 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-18 17:34:08 -0400 (Thu, 18 Mar 2010)
New Revision: 11808
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/ejb-jar.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/hornetq-jms.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/jboss.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/hornetq-jms.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/hornetq-jms.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
Log:
[JBWS-2966] Fixing tests for properly deploying queues as required by HornetQ
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -608,7 +608,7 @@
</webinf>
</war>
- <!-- jaxws-jbws2949 -->
+ <!-- jaxws-jbws2949 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2949/*.class"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -205,6 +205,21 @@
<include name="wsdl/**"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jmstransport-as6.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jmstransport/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jmstransport/META-INF-AS6">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jmstransport.sar">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxrpc-samples-jmstransport.jar"/>
@@ -213,6 +228,14 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jmstransport-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-samples-jmstransport-as6.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jmstransport/META-INF-AS6">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
<!-- jaxrpc-samples-jsr109ejb-rpc -->
<jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-rpc.jar">
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -60,6 +60,11 @@
<include name="jboss.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-queue.sar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/dar/generated/*.class"/>
@@ -116,6 +121,15 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-samples-dar-jms-client.war"/>
+ <include name="jaxws-samples-dar-jms-client.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-test.sar">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-samples-dar-jms-client.war"/>
@@ -124,6 +138,14 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-test-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-samples-dar-jms-client.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
<!-- jaxws-samples-jmstransport -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.jar">
@@ -143,6 +165,14 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-samples-jmstransport.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="hornetq-jms.xml"/>
+ </metainf>
+ </jar>
<!-- jaxws-samples-news -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-newspaper.jar">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-03-18 21:34:08 UTC (rev 11808)
@@ -31,11 +31,14 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.ObjectNameFactory;
import junit.framework.Test;
@@ -52,8 +55,23 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar");
+ //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
+ return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxrpc-samples-jmstransport-as6.sar" : "jaxrpc-samples-jmstransport.sar");
}
+
+ private static boolean isHornetQAvailable()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
+ String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
+ return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
/**
* Send the message to the specified queue
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-03-18 21:34:08 UTC (rev 11808)
@@ -30,6 +30,7 @@
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -44,8 +45,23 @@
public static Test suite()
{
- return new JBossWSTestSetup(AddressingClientTestCase.class, "jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar");
+ //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
+ return new JBossWSTestSetup(AddressingClientTestCase.class, isHornetQAvailable() ? "jaxws-samples-dar-queue.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar" : "jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar");
}
+
+ private static boolean isHornetQAvailable()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
+ String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
+ return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
public void testSync() throws Exception
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2010-03-18 21:34:08 UTC (rev 11808)
@@ -101,12 +101,13 @@
@Oneway
public void onewayProcess(DarRequest request)
{
+ QueueConnection con = null;
QueueSession queueSession =null;
QueueSender sender = null;
try {
InitialContext context = new InitialContext();
QueueConnectionFactory connectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory");
- QueueConnection con = connectionFactory.createQueueConnection();
+ con = connectionFactory.createQueueConnection();
queueSession = con.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = (Queue)context.lookup("queue/DarQueue");
sender = queueSession.createSender(queue);
@@ -131,6 +132,11 @@
queueSession.close();
}
catch(Exception e1) {}
+ try
+ {
+ con.close();
+ }
+ catch(Exception e1) {}
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-03-18 21:34:08 UTC (rev 11808)
@@ -34,11 +34,14 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
import junit.framework.Test;
+import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -53,9 +56,24 @@
public static Test suite()
{
- return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar");
+ //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
+ return new JBossWSTestSetup(JMSClientTestCase.class, isHornetQAvailable() ? "jaxws-samples-dar-jms-client-test-as6.sar,jaxws-samples-dar-jms.jar" : "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar");
}
+ private static boolean isHornetQAvailable()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
+ String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
+ return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
public void test() throws Exception
{
String url = "http://" + getServerHost() + ":8080/dar-jms-client/JMSClient";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-18 21:28:04 UTC (rev 11807)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-18 21:34:08 UTC (rev 11808)
@@ -35,6 +35,7 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -42,7 +43,9 @@
import junit.framework.Test;
import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -57,9 +60,24 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar");
+ //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
+ return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-samples-jmstransport-as6.sar" : "jaxws-samples-jmstransport.sar");
}
+ private static boolean isHornetQAvailable()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
+ String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
+ return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
public void testPublishedContract() throws Exception
{
//test the published contract using the 2nd port, which is an http one
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/ejb-jar.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/ejb-jar.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/ejb-jar.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/j2ee/dtds/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>OrganizationMDB</ejb-name>
+ <ejb-class>org.jboss.test.ws.jaxrpc.samples.jmstransport.OrganizationJMSEndpoint</ejb-class>
+ <transaction-type>Container</transaction-type>
+ <message-selector></message-selector>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+ </enterprise-beans>
+</ejb-jar>
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/hornetq-jms.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/hornetq-jms.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/hornetq-jms.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="RequestQueue">
+ <entry name="/queue/RequestQueue"/>
+ </queue>
+ <queue name="ResponseQueue">
+ <entry name="/queue/ResponseQueue"/>
+ </queue>
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/jboss.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/jboss.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/jboss.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>OrganizationMDB</ejb-name>
+ <destination-jndi-name>queue/RequestQueue</destination-jndi-name>
+ <depends>org.hornetq:name="RequestQueue",module=JMS,type=Queue</depends>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jmstransport/META-INF-AS6/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/hornetq-jms.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/hornetq-jms.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/hornetq-jms.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="DarRequestQueue">
+ <entry name="/queue/DarRequestQueue"/>
+ </queue>
+ <queue name="DarResponseQueue">
+ <entry name="/queue/DarResponseQueue"/>
+ </queue>
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/hornetq-jms.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/hornetq-jms.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/hornetq-jms.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="DarQueue">
+ <entry name="/queue/DarQueue"/>
+ </queue>
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml 2010-03-18 21:34:08 UTC (rev 11808)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="RequestQueue">
+ <entry name="/queue/RequestQueue"/>
+ </queue>
+ <queue name="ResponseQueue">
+ <entry name="/queue/ResponseQueue"/>
+ </queue>
+</configuration>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
14 years, 9 months
JBossWS SVN: r11807 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-18 17:28:04 -0400 (Thu, 18 Mar 2010)
New Revision: 11807
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java
Log:
[JBWS-2966] Fixing AbstractJMSTransportSupport for dealing with HornetQDestination which is both a Queue and a Topic. A more deep refactoring is required here in future
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java 2010-03-18 21:25:45 UTC (rev 11806)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java 2010-03-18 21:28:04 UTC (rev 11807)
@@ -46,6 +46,7 @@
import javax.naming.InitialContext;
import javax.xml.soap.SOAPException;
+import org.hornetq.jms.client.HornetQDestination;
import org.jboss.logging.Logger;
import org.jboss.util.NestedRuntimeException;
import org.jboss.wsf.spi.SPIProvider;
@@ -67,7 +68,7 @@
public abstract class AbstractJMSTransportSupport implements MessageListener
{
// logging support
- protected Logger log = Logger.getLogger(AbstractJMSTransportSupport.class);
+ protected static Logger log = Logger.getLogger(AbstractJMSTransportSupport.class);
private QueueConnectionFactory conFactory;
@@ -98,10 +99,12 @@
String fromName = null;
Destination destination = message.getJMSDestination();
- if (destination instanceof Queue)
- fromName = "queue/" + ((Queue)destination).getQueueName();
- if (destination instanceof Topic)
- fromName = "topic/" + ((Topic)destination).getTopicName();
+ if (destination instanceof HornetQDestination)
+ fromName = getFromName(destination, ((HornetQDestination)destination).isQueue());
+ else if (destination instanceof Queue)
+ fromName = getFromName(destination, true);
+ else if (destination instanceof Topic)
+ fromName = getFromName(destination, false);
InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes());
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024);
@@ -137,7 +140,12 @@
throw new EJBException(e);
}
}
-
+
+ private static String getFromName(Destination destination, boolean queue) throws JMSException
+ {
+ return queue ? "queue/" + ((Queue)destination).getQueueName() : "topic/" + ((Topic)destination).getTopicName();
+ }
+
protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
14 years, 9 months
JBossWS SVN: r11806 - in stack/native/trunk: modules/core and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-18 17:25:45 -0400 (Thu, 18 Mar 2010)
New Revision: 11806
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/pom.xml
Log:
[JBWS-2966] Adding dependency on HornetQ
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-03-18 13:23:44 UTC (rev 11805)
+++ stack/native/trunk/modules/core/pom.xml 2010-03-18 21:25:45 UTC (rev 11806)
@@ -138,6 +138,14 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-03-18 13:23:44 UTC (rev 11805)
+++ stack/native/trunk/pom.xml 2010-03-18 21:25:45 UTC (rev 11806)
@@ -69,6 +69,7 @@
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
+ <hornetq.version>2.1.0.r8931</hornetq.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.1.5.GA</netty.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
@@ -197,6 +198,7 @@
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
+
<!-- transitive dependencies -->
<dependency>
<groupId>commons-logging</groupId>
@@ -411,6 +413,21 @@
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
14 years, 9 months
JBossWS SVN: r11805 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-03-18 09:23:44 -0400 (Thu, 18 Mar 2010)
New Revision: 11805
Added:
stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/
Log:
[JBPAPP-3943] Branch for patch
Copied: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943 (from rev 11804, stack/native/tags/jbossws-native-3.1.2.SP3)
14 years, 9 months
JBossWS SVN: r11804 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-03-18 06:52:16 -0400 (Thu, 18 Mar 2010)
New Revision: 11804
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-2887]:update to cxf 2.2.6
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-03-18 10:15:16 UTC (rev 11803)
+++ stack/cxf/trunk/pom.xml 2010-03-18 10:52:16 UTC (rev 11804)
@@ -55,7 +55,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.2.5</cxf.version>
+ <cxf.version>2.2.6</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
14 years, 9 months