JBossWS SVN: r16396 - in stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client: configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-07 13:04:59 -0400 (Thu, 07 Jun 2012)
New Revision: 16396
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/HandlerChainSortInterceptor.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
Log:
[JBWS-3335] Modifying ProviderImpl for reading default client configuration from server config and setting it into the client proxy; also adding an out interceptor for sorting PRE/POST handlers
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2012-06-07 16:58:49 UTC (rev 16395)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2012-06-07 17:04:59 UTC (rev 16396)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -31,18 +31,30 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.Binding;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointContext;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.spi.Invoker;
import javax.xml.ws.spi.ServiceDelegate;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.ServiceImpl;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.jboss.logging.Logger;
+import org.jboss.ws.common.configuration.ConfigHelper;
import org.jboss.ws.common.utils.DelegateClassLoader;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.config.ClientConfig;
+import org.jboss.wsf.stack.cxf.client.configuration.HandlerChainSortInterceptor;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
import org.w3c.dom.Element;
@@ -60,6 +72,16 @@
*/
public class ProviderImpl extends org.apache.cxf.jaxws22.spi.ProviderImpl
{
+ private static final boolean inContainer;
+ private static ServerConfig serverConfig;
+
+ static {
+ //a trick for verifying if running in-container (AS7): the jbossws-cxf and cxf classes come from different
+ //(module) classloader on AS7, while out-of-container they are coming from the same flat classloader;
+ //this is used as an optimization to avoid looking for ServerConfig when running out-of-container
+ inContainer = ProviderImpl.class.getClassLoader() != org.apache.cxf.jaxws22.spi.ProviderImpl.class.getClassLoader();
+ }
+
@Override
protected org.apache.cxf.jaxws.EndpointImpl createEndpointImpl(Bus bus, String bindingId, Object implementor,
WebServiceFeature... features)
@@ -138,7 +160,7 @@
{
restoreTCCL = checkAndFixContextClassLoader(origClassLoader);
Bus bus = setValidThreadDefaultBus();
- return new ServiceImpl(bus, url, qname, cls);
+ return new JBossWSServiceImpl(bus, url, qname, cls);
}
finally
{
@@ -157,8 +179,13 @@
try
{
restoreTCCL = checkAndFixContextClassLoader(origClassLoader);
- setValidThreadDefaultBus();
- return super.createServiceDelegate(wsdlDocumentLocation, serviceName, serviceClass, features);
+ Bus bus = setValidThreadDefaultBus();
+ for (WebServiceFeature f : features) {
+ if (!f.getClass().getName().startsWith("javax.xml.ws")) {
+ throw new WebServiceException("Unknown feature error: " + f.getClass().getName());
+ }
+ }
+ return new JBossWSServiceImpl(bus, wsdlDocumentLocation, serviceName, serviceClass, features);
}
finally
{
@@ -419,5 +446,48 @@
delegate.publish(context);
}
}
+
+ /**
+ * An extension of the org.apache.cxf.jaxws.ServiceImpl allowing for
+ * setting JBossWS client default config handlers.
+ *
+ */
+ static final class JBossWSServiceImpl extends ServiceImpl {
+
+ public JBossWSServiceImpl(Bus b, URL url, QName name, Class<?> cls, WebServiceFeature ... f) {
+ super(b, url, name, cls, f);
+ }
+
+ protected <T> T createPort(QName portName, EndpointReferenceType epr, Class<T> serviceEndpointInterface,
+ WebServiceFeature... features) {
+ T port = super.createPort(portName, epr, serviceEndpointInterface, features);
+ Binding binding = ((BindingProvider)port).getBinding();
+ ClientProxy.getClient(port).getOutInterceptors().add(new HandlerChainSortInterceptor(binding));
+ if (inContainer) {
+ ServerConfig sc = getServerConfig();
+ if (sc != null) {
+ for (ClientConfig config : sc.getClientConfigs()) {
+ if (config.getConfigName().equals(ClientConfig.STANDARD_CLIENT_CONFIG)) {
+ ConfigHelper helper = new ConfigHelper();
+ helper.setupConfigHandlers(binding, config);
+ }
+ }
+ }
+ }
+ return port;
+ }
+
+ }
+
+ private static synchronized ServerConfig getServerConfig()
+ {
+ if (serverConfig == null)
+ {
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ serverConfig = spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig();
+ }
+ return serverConfig;
+ }
}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/HandlerChainSortInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/HandlerChainSortInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/HandlerChainSortInterceptor.java 2012-06-07 17:04:59 UTC (rev 16396)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.client.configuration;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.xml.ws.Binding;
+import javax.xml.ws.handler.Handler;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.jboss.ws.common.configuration.ConfigDelegateHandlerComparator;
+
+
+/**
+ * An interceptor for properly sorting handlers, some of which might come from PRE/POST
+ * handler chains in the client / endpoint pre-defined configuration.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Jun-2012
+ */
+public class HandlerChainSortInterceptor extends AbstractPhaseInterceptor<Message>
+{
+ private Binding binding;
+ @SuppressWarnings("rawtypes")
+ private static Comparator<Handler> comparator = new ConfigDelegateHandlerComparator<Handler>();
+
+ public HandlerChainSortInterceptor(Binding b)
+ {
+ super(Phase.SETUP);
+ binding = b;
+ }
+
+ @Override
+ public void handleMessage(Message message) throws Fault
+ {
+ if (binding != null) {
+ @SuppressWarnings("rawtypes")
+ List<Handler> list = binding.getHandlerChain();
+ if (list != null && !list.isEmpty()) {
+ Collections.sort(list, comparator);
+ binding.setHandlerChain(list);
+ }
+ }
+ }
+
+}
12 years, 7 months
JBossWS SVN: r16395 - in common/trunk/src: test/java/org/jboss/test/ws/common and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-07 12:58:49 -0400 (Thu, 07 Jun 2012)
New Revision: 16395
Added:
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/LogicalConfigDelegateHandler.java
common/trunk/src/test/java/org/jboss/test/ws/common/configuration/
common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java
Modified:
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties
Log:
[JBWS-3335] Adding ConfigDelegateHandler and a specific comparator to allow PRE/POST handlers' sorting
Added: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java 2012-06-07 16:58:49 UTC (rev 16395)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.common.configuration;
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+
+/**
+ * JBossWS client / endpoint configuration-contributed handler
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Jun-2012
+ *
+ */
+public class ConfigDelegateHandler<T extends MessageContext> implements Handler<T>
+{
+ protected final Handler<T> delegate;
+ private final boolean isPre;
+
+ public ConfigDelegateHandler(Handler<T> delegate, boolean isPre) {
+ this.delegate = delegate;
+ this.isPre = isPre;
+ }
+
+ @Override
+ public boolean handleMessage(T context)
+ {
+ return delegate.handleMessage(context);
+ }
+
+ @Override
+ public boolean handleFault(T context)
+ {
+ return handleFault(context);
+ }
+
+ @Override
+ public void close(MessageContext context)
+ {
+ delegate.close(context);
+ }
+
+ public boolean isPre()
+ {
+ return isPre;
+ }
+}
Added: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java 2012-06-07 16:58:49 UTC (rev 16395)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.common.configuration;
+
+import java.util.Comparator;
+
+import javax.xml.ws.handler.Handler;
+
+/**
+ * A Handler comparator properly dealing with PRE/POST ConfigDelegateHandler instances
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Jun-2012
+ *
+ */
+@SuppressWarnings("rawtypes")
+public final class ConfigDelegateHandlerComparator<T extends Handler> implements Comparator<T>
+{
+ @Override
+ public int compare(Handler o1, Handler o2)
+ {
+ int i1 = 0;
+ int i2 = 0;
+ if (o1 instanceof ConfigDelegateHandler)
+ {
+ i1 = ((ConfigDelegateHandler) o1).isPre() ? -1 : 1;
+ }
+ if (o2 instanceof ConfigDelegateHandler)
+ {
+ i2 = ((ConfigDelegateHandler) o2).isPre() ? -1 : 1;
+ }
+ return i1 - i2;
+ }
+}
\ No newline at end of file
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-06-07 16:31:49 UTC (rev 16394)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-06-07 16:58:49 UTC (rev 16395)
@@ -33,6 +33,7 @@
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.SOAPBinding;
@@ -40,7 +41,11 @@
import org.jboss.ws.api.configuration.ClientConfigurer;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.utils.DelegateClassLoader;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ClientConfig;
import org.jboss.wsf.spi.metadata.config.CommonConfig;
import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
@@ -76,24 +81,37 @@
}
private static ClientConfig readConfig(String configFile, String configName) {
- InputStream is = null;
- try
- {
- is = SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
- ConfigRoot config = ConfigMetaDataParser.parse(is);
- return config.getClientConfigByName(configName);
- }
- catch (Exception e)
- {
- throw new RuntimeException(BundleUtils.getMessage(bundle, "COULD_NOT_READ_CONFIG", configFile));
- }
- finally
- {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) { } //ignore
+ if (configFile != null) {
+ InputStream is = null;
+ try
+ {
+ is = SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
+ ConfigRoot config = ConfigMetaDataParser.parse(is);
+ return config.getClientConfigByName(configName);
}
+ catch (Exception e)
+ {
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "COULD_NOT_READ_CONFIG", configFile));
+ }
+ finally
+ {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e) { } //ignore
+ }
+ }
+ } else {
+ ServerConfig sc = getServerConfig();
+ if (sc != null) {
+ for (ClientConfig config : sc.getClientConfigs()) {
+ if (config.getConfigName().equals(configName))
+ {
+ return config;
+ }
+ }
+ }
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "CONFIG_NOT_FOUND", configName));
}
}
@@ -107,15 +125,15 @@
public void setupConfigHandlers(Binding binding, CommonConfig config)
{
if (config != null) {
- List<Handler> handlers = convertToHandlers(config.getPreHandlerChains(), binding); //PRE
+ List<Handler> handlers = convertToHandlers(config.getPreHandlerChains(), binding, true); //PRE
handlers.addAll(binding.getHandlerChain()); //ENDPOINT
- handlers.addAll(convertToHandlers(config.getPostHandlerChains(), binding)); //POST
+ handlers.addAll(convertToHandlers(config.getPostHandlerChains(), binding, false)); //POST
binding.setHandlerChain(handlers);
}
}
- @SuppressWarnings("rawtypes")
- private static List<Handler> convertToHandlers(List<UnifiedHandlerChainMetaData> handlerChains, Binding binding)
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private static List<Handler> convertToHandlers(List<UnifiedHandlerChainMetaData> handlerChains, Binding binding, boolean isPre)
{
List<Handler> handlers = new LinkedList<Handler>();
if (handlerChains != null && !handlerChains.isEmpty())
@@ -139,7 +157,14 @@
{
if (h instanceof Handler)
{
- handlers.add((Handler)h);
+ if (h instanceof LogicalHandler)
+ {
+ handlers.add(new LogicalConfigDelegateHandler((LogicalHandler)h, isPre));
+ }
+ else
+ {
+ handlers.add(new ConfigDelegateHandler((Handler)h, isPre));
+ }
}
else
{
@@ -181,4 +206,12 @@
return null;
}
}
+
+ private static ServerConfig getServerConfig()
+ {
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ ServerConfigFactory scf = spiProvider.getSPI(ServerConfigFactory.class, cl);
+ return scf != null ? scf.getServerConfig() : null;
+ }
}
Added: common/trunk/src/main/java/org/jboss/ws/common/configuration/LogicalConfigDelegateHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/LogicalConfigDelegateHandler.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/LogicalConfigDelegateHandler.java 2012-06-07 16:58:49 UTC (rev 16395)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.common.configuration;
+
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
+
+
+/**
+ * JBossWS client / endpoint configuration-contributed logical handler
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Jun-2012
+ *
+ */
+public class LogicalConfigDelegateHandler<T extends LogicalMessageContext> extends ConfigDelegateHandler<T> implements LogicalHandler<T>
+{
+ public LogicalConfigDelegateHandler(LogicalHandler<T> delegate, boolean isPre) {
+ super(delegate, isPre);
+ }
+}
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties 2012-06-07 16:31:49 UTC (rev 16394)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties 2012-06-07 16:58:49 UTC (rev 16395)
@@ -2,4 +2,5 @@
INIT_PARAMS_NOT_SUPPORTED=Init params not supported.
NOT_HANDLER_INSTANCE={0} is not a JAX-WS Handler instance
CAN_NOT_ADD_HANDLER=Could not add handler {0} as part of client or endpoint configuration
-COULD_NOT_READ_CONFIG=Could not read configuration from file {0}
\ No newline at end of file
+COULD_NOT_READ_CONFIG=Could not read configuration from file {0}
+CONFIG_NOT_FOUND=Configuration {0} not found
\ No newline at end of file
Added: common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java
===================================================================
--- common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java (rev 0)
+++ common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java 2012-06-07 16:58:49 UTC (rev 16395)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.common.configuration;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+import junit.framework.TestCase;
+
+import org.jboss.ws.common.configuration.ConfigDelegateHandler;
+import org.jboss.ws.common.configuration.ConfigDelegateHandlerComparator;
+
+/**
+ * Test the ConfigDelegateHandlerComparator
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 07-Jun-2012
+ */
+public class ConfigDelegateHandlerComparatorTestCase extends TestCase
+{
+ public void testComparator() throws Exception
+ {
+ List<NamedHandler> list = new LinkedList<NamedHandler>();
+ list.add(new TestConfigDelegateHandler(new TestHandler("post1"), false));
+ list.add(new TestHandler("h1"));
+ list.add(new TestConfigDelegateHandler(new TestHandler("post2"), false));
+ list.add(new TestConfigDelegateHandler(new TestHandler("pre1"), true));
+ list.add(new TestConfigDelegateHandler(new TestHandler("pre2"), true));
+ list.add(new TestHandler("h2"));
+ list.add(new TestHandler("h3"));
+ list.add(new TestHandler("h4"));
+ list.add(new TestHandler("h5"));
+ list.add(new TestConfigDelegateHandler(new TestHandler("post3"), false));
+ list.add(new TestConfigDelegateHandler(new TestHandler("pre3"), true));
+ list.add(new TestConfigDelegateHandler(new TestHandler("pre4"), true));
+ list.add(new TestHandler("h6"));
+ list.add(new TestConfigDelegateHandler(new TestHandler("post4"), false));
+
+ Collections.sort(list, new ConfigDelegateHandlerComparator<Handler<MessageContext>>());
+
+ StringBuilder sb = new StringBuilder();
+ for (NamedHandler h : list)
+ {
+ sb.append(h.getName());
+ sb.append(" ");
+ }
+ assertEquals("pre1 pre2 pre3 pre4 h1 h2 h3 h4 h5 h6 post1 post2 post3 post4", sb.toString().trim());
+ }
+
+ private static interface NamedHandler extends Handler<MessageContext>
+ {
+
+ public String getName();
+
+ }
+
+ private static class TestConfigDelegateHandler extends ConfigDelegateHandler<MessageContext> implements NamedHandler
+ {
+
+ public TestConfigDelegateHandler(Handler<MessageContext> delegate, boolean isPre)
+ {
+ super(delegate, isPre);
+ }
+
+ @Override
+ public String getName()
+ {
+ return delegate instanceof NamedHandler ? ((NamedHandler) delegate).getName() : null;
+ }
+
+ }
+
+ private static class TestHandler implements NamedHandler
+ {
+
+ private String name;
+
+ public TestHandler(String name)
+ {
+ this.name = name;
+ }
+
+ @Override
+ public String getName()
+ {
+ return name;
+ }
+
+ @Override
+ public boolean handleMessage(MessageContext context)
+ {
+ return false;
+ }
+
+ @Override
+ public boolean handleFault(MessageContext context)
+ {
+ return false;
+ }
+
+ @Override
+ public void close(MessageContext context)
+ {
+ }
+ }
+}
12 years, 7 months
JBossWS SVN: r16394 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-07 12:31:49 -0400 (Thu, 07 Jun 2012)
New Revision: 16394
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
Log:
[JBWS-3335] Adding constants for standard client config name
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2012-06-05 10:49:36 UTC (rev 16393)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2012-06-07 16:31:49 UTC (rev 16394)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -29,4 +29,5 @@
*/
public class ClientConfig extends AbstractCommonConfig
{
+ public static final String STANDARD_CLIENT_CONFIG = "Standard-Client-Config";
}
12 years, 7 months
JBossWS SVN: r16393 - in stack/cxf/tags/jbossws-cxf-4.1.0.Beta1: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:49:36 -0400 (Tue, 05 Jun 2012)
New Revision: 16393
Modified:
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/dist/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/endorsed/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/shared-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/pom.xml
Log:
Fixing poms
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/transports/http/httpserver/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/addons/transports/http/httpserver/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/client/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/client/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/dist/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/dist/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/dist/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distribution</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/endorsed/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/endorsed/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/resources/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/resources/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/server/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/server/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-tests/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/cxf-tests/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/shared-tests/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/modules/testsuite/shared-tests/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
+++ stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/pom.xml 2012-06-05 10:49:36 UTC (rev 16393)
@@ -32,20 +32,20 @@
<description>JBossWS CXF stack</description>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.1.0...</url>
</scm>
<!-- Modules -->
@@ -59,15 +59,15 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.1-SNAPSHOT</jbossws.api.version>
- <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version>
- <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version>
- <jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version>
- <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version>
+ <jbossws.api.version>1.0.1.Beta1</jbossws.api.version>
+ <jbossws.spi.version>2.1.0.Beta1</jbossws.spi.version>
+ <jbossws.common.version>2.1.0.Beta1</jbossws.common.version>
+ <jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
+ <jbossws.shared.testsuite.version>4.1.0.Beta1</jbossws.shared.testsuite.version>
+ <jbossws.jboss710.version>4.1.0.Beta1</jbossws.jboss710.version>
+ <jbossws.jboss711.version>4.1.0.Beta1</jbossws.jboss711.version>
+ <jbossws.jboss712.version>4.1.0.Beta1</jbossws.jboss712.version>
+ <jbossws.native.version>4.1.0.Beta1</jbossws.native.version>
<jboss710.version>7.1.0.Final</jboss710.version>
<jboss711.version>7.1.1.Final</jboss711.version>
<jboss712.version>7.1.2.Final</jboss712.version>
@@ -83,7 +83,7 @@
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketlink.version>2.1.1.Final</picketlink.version>
- <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version>
+ <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
<httpserver.version>1.0.0.Final</httpserver.version>
<jaxb.api.version>1.0.3.Final</jaxb.api.version>
<jaxb.impl.version>2.2.5</jaxb.impl.version>
12 years, 7 months
JBossWS SVN: r16392 - projects/jaxws-jboss-httpserver-httpspi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:48:54 -0400 (Tue, 05 Jun 2012)
New Revision: 16392
Modified:
projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml
Log:
Move to cxf 2.6.1
Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml
===================================================================
--- projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
+++ projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml 2012-06-05 10:48:54 UTC (rev 16392)
@@ -28,7 +28,7 @@
<properties>
<jaxws.version>2.0.0.Final</jaxws.version>
<junit.version>4.8.1</junit.version>
- <cxf.version>2.5.2</cxf.version>
+ <cxf.version>2.6.1</cxf.version>
<servlet-api.version>1.0.0.Final</servlet-api.version>
<jboss.httpserver.version>1.0.0.Final</jboss.httpserver.version>
</properties>
12 years, 7 months
JBossWS SVN: r16391 - in stack/native/tags/jbossws-native-4.1.0.Beta1: modules/core and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:33:01 -0400 (Tue, 05 Jun 2012)
New Revision: 16391
Modified:
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/core/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/dist/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/resources/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/services/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-4.1.0.Beta1/pom.xml
Log:
Fixing poms
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/core/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/core/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/dist/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/dist/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/dist/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/resources/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/resources/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/services/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/services/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/services/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/native-tests/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/native-tests/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/modules/testsuite/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.1.0.Beta1/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.1.0.Beta1/pom.xml 2012-06-05 10:18:34 UTC (rev 16390)
+++ stack/native/tags/jbossws-native-4.1.0.Beta1/pom.xml 2012-06-05 10:33:01 UTC (rev 16391)
@@ -31,20 +31,20 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0.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 -->
@@ -56,12 +56,12 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.0.GA</jbossws.api.version>
- <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version>
+ <jbossws.api.version>1.0.1.Beta1</jbossws.api.version>
+ <jbossws.spi.version>2.1.0.Beta1</jbossws.spi.version>
+ <jbossws.common.version>2.1.0.Beta1</jbossws.common.version>
+ <jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
+ <jbossws.shared.testsuite.version>4.1.0.Beta1</jbossws.shared.testsuite.version>
+ <jbossws.jboss712.version>4.1.0.Beta1</jbossws.jboss712.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<javassist.version>3.15.0-GA</javassist.version>
12 years, 7 months
JBossWS SVN: r16390 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:18:34 -0400 (Tue, 05 Jun 2012)
New Revision: 16390
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
Create logger only when needed for exception dealing
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-06-05 10:17:41 UTC (rev 16389)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-06-05 10:18:34 UTC (rev 16390)
@@ -46,10 +46,6 @@
*/
public final class EndpointServlet extends AbstractEndpointServlet implements ServletDelegate
{
-
- // provide logging
- protected static final Logger log = Logger.getLogger(EndpointServlet.class);
-
private List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
private final Object lock = new Object();
@@ -85,7 +81,7 @@
}
catch (Exception exception)
{
- log.error(exception.getLocalizedMessage(), exception);
+ Logger.getLogger(EndpointServlet.class).error(exception.getLocalizedMessage(), exception);
}
}
this.preDestroyRegistry.clear();
12 years, 7 months
JBossWS SVN: r16389 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:17:41 -0400 (Tue, 05 Jun 2012)
New Revision: 16389
Modified:
stack/native/trunk/pom.xml
Log:
Use latest parent
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-06-05 10:17:04 UTC (rev 16388)
+++ stack/native/trunk/pom.xml 2012-06-05 10:17:41 UTC (rev 16389)
@@ -37,7 +37,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0.GA</version>
</parent>
<!-- Source Control Management -->
12 years, 7 months
JBossWS SVN: r16388 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:17:04 -0400 (Tue, 05 Jun 2012)
New Revision: 16388
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest parent
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-06-05 10:15:36 UTC (rev 16387)
+++ stack/cxf/trunk/pom.xml 2012-06-05 10:17:04 UTC (rev 16388)
@@ -38,7 +38,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0.GA</version>
</parent>
<!-- Source Control Management -->
12 years, 7 months
JBossWS SVN: r16387 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-05 06:15:36 -0400 (Tue, 05 Jun 2012)
New Revision: 16387
Added:
stack/cxf/tags/jbossws-cxf-4.1.0.Beta1/
Log:
Tagging jbossws-cxf-4.1.0.Beta1
12 years, 7 months