JBossWS SVN: r11290 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 02:03:39 -0500 (Tue, 15 Dec 2009)
New Revision: 11290
Added:
stack/native/branches/jbossws-native-3.2.2.GA/
Log:
creating QA branch
Copied: stack/native/branches/jbossws-native-3.2.2.GA (from rev 11289, stack/native/trunk)
15 years, 11 months
JBossWS SVN: r11289 - stack/metro/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 02:02:57 -0500 (Tue, 15 Dec 2009)
New Revision: 11289
Added:
stack/metro/branches/jbossws-metro-3.2.2.GA/
Log:
creating QA branch
Copied: stack/metro/branches/jbossws-metro-3.2.2.GA (from rev 11288, stack/metro/trunk)
15 years, 11 months
JBossWS SVN: r11288 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 02:02:21 -0500 (Tue, 15 Dec 2009)
New Revision: 11288
Added:
stack/cxf/branches/jbossws-cxf-3.2.2.GA/
Log:
creating QA branch
Copied: stack/cxf/branches/jbossws-cxf-3.2.2.GA (from rev 11287, stack/cxf/trunk)
15 years, 11 months
JBossWS SVN: r11287 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 02:00:14 -0500 (Tue, 15 Dec 2009)
New Revision: 11287
Added:
framework/branches/jbossws-framework-3.2.2.GA/
Log:
creating QA branch
Copied: framework/branches/jbossws-framework-3.2.2.GA (from rev 11286, framework/trunk)
15 years, 11 months
JBossWS SVN: r11286 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 01:58:45 -0500 (Tue, 15 Dec 2009)
New Revision: 11286
Added:
common/branches/jbossws-common-1.2.2.GA/
Log:
creating QA branch
Copied: common/branches/jbossws-common-1.2.2.GA (from rev 11285, common/trunk)
15 years, 11 months
JBossWS SVN: r11285 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-15 01:57:31 -0500 (Tue, 15 Dec 2009)
New Revision: 11285
Added:
spi/branches/jbossws-spi-1.2.2.GA/
Log:
creating QA branch
Copied: spi/branches/jbossws-spi-1.2.2.GA (from rev 11284, spi/trunk)
15 years, 11 months
JBossWS SVN: r11284 - in stack/cxf/trunk/modules/server/src/main: resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-14 10:49:37 -0500 (Mon, 14 Dec 2009)
New Revision: 11284
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Log:
[JBWS-2791]:revert the change
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java 2009-12-14 15:49:37 UTC (rev 11284)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.integration.WSConstants;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-/**
- * A deployer to correct the jms endpoint address to unknown address.<br>
- * The final jms address will be set when servlet is initilized
- * @author <a herf="mailto:ema@redhat.com>Jim Ma</a>
- */
-public class JMSEndpointAddressDeploymentAspect extends DeploymentAspect
-{
- private static final String JMS_NS = "http://cxf.apache.org/transports/jms";
- private static final String UNKOWN_ADDRESS = "unkwon address";
- @SuppressWarnings("unchecked")
- @Override
- public void start(Deployment dep)
- {
- //get EndpointRegistry
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
- String url = contextParams.get(CXFServletExt.PARAM_CXF_BEANS_URL);
- try
- {
- Document document = DOMUtils.getDocumentBuilder().parse(url);
- List<Element> elements = DOMUtils.getChildElementsAsList(document.getDocumentElement(), new QName("http://cxf.apache.org/jaxws","endpoint"));
- //TODO: parse the jms address from jbossws-cxf.xml and set endpoint address (java first)
- for(Element element: elements) {
- String transportId = DOMUtils.getAttributeValue(element, "transportId");
- if (JMS_NS.equals(transportId)) {
- String implementor = DOMUtils.getAttributeValue(element, "implementor");
- if (implementor != null) {
- for (Endpoint endpoint : dep.getService().getEndpoints()) {
- if (implementor.equals(endpoint.getTargetBeanClass().getName())) {
- endpoint.setAddress(UNKOWN_ADDRESS);
- }
- }
- }
- }
- }
-
- }
- catch (Exception e)
- {
- log.warn("Failed to parse jbossws-cxf.xml", e);
- }
- }
-}
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2009-12-14 15:49:37 UTC (rev 11284)
@@ -46,12 +46,6 @@
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">JmsEndpointAddress</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
<property name="provides">ResourceResolver</property>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2009-12-14 15:49:37 UTC (rev 11284)
@@ -44,11 +44,6 @@
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
</bean>
- <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">JmsEndpointAddress</property>
- </bean>
-
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
<property name="provides">ResourceResolver</property>
15 years, 11 months
JBossWS SVN: r11280 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP3: modules/client and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-11 16:19:33 -0500 (Fri, 11 Dec 2009)
New Revision: 11280
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/management/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/pom.xml
Log:
Set version strings to 3.1.2.SP3
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/client/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/client/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/management/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/management/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/management/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/resources/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/resources/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/server/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/server/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/cxf-tests/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/cxf-tests/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/modules/testsuite/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP3/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP3/pom.xml 2009-12-11 21:10:16 UTC (rev 11279)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP3/pom.xml 2009-12-11 21:19:33 UTC (rev 11280)
@@ -17,7 +17,7 @@
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP3</version>
<!-- Parent -->
<parent>
15 years, 11 months
JBossWS SVN: r11279 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-11 16:10:16 -0500 (Fri, 11 Dec 2009)
New Revision: 11279
Added:
stack/cxf/tags/jbossws-cxf-3.1.2.SP3/
Log:
Tag for RAP 5.0.0.GA CXF TP (onlu the build-tp-installer target is functional)
Copied: stack/cxf/tags/jbossws-cxf-3.1.2.SP3 (from rev 11278, stack/cxf/branches/jbossws-cxf-3.1.2)
15 years, 11 months
JBossWS SVN: r11278 - spi/trunk/src/main/java/org/jboss/wsf/spi/util.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-11 11:54:19 -0500 (Fri, 11 Dec 2009)
New Revision: 11278
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
Log:
[JBWS-2859] rollback
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-12-11 12:13:27 UTC (rev 11277)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-12-11 16:54:19 UTC (rev 11278)
@@ -33,21 +33,22 @@
import java.util.Map;
import java.util.Properties;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Load a service class using this ordered lookup procedure
*
* @author Thomas.Diesler(a)jboss.com
* @author alessio.soldano(a)jboss.com
- * @author ropalka(a)redhat.com
* @since 14-Dec-2006
*/
public abstract class ServiceLoader
{
/**
- * A synchronized weak hash map that keeps factory objects.
+ * A synchronized weak hash map that keeps factory names retrieved using Service API (META-INF/services/*) for each classloader.
+ * Weak keys are used to remove entries when classloaders are garbage collected; values are service-property-name -> factory name maps.
*/
- private static Map<String, Object> serviceMap = Collections.synchronizedMap(new WeakHashMap<String, Object>());
+ private static Map<ClassLoader, Map<String, String>> serviceMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, String>>());
/**
* This method uses the algorithm below using the JAXWS Provider as an example.
@@ -66,21 +67,15 @@
*/
public static Object loadService(String propertyName, String defaultFactory)
{
- Object factory = serviceMap.get(propertyName);
+ Object factory = loadFromServices(propertyName, null);
if (factory == null)
{
- factory = loadFromServices(propertyName, null);
- if (factory == null)
- {
- factory = loadFromPropertiesFile(propertyName, null);
- }
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
- if (factory != null)
- serviceMap.put(propertyName, factory);
+ factory = loadFromPropertiesFile(propertyName, null);
}
+ if (factory == null)
+ {
+ factory = loadFromSystemProperty(propertyName, defaultFactory);
+ }
return factory;
}
@@ -120,15 +115,29 @@
private static String getServiceNameUsingCache(ClassLoader loader, String filename) throws IOException
{
- InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
- String factoryName = null;
- if (inStream != null)
+ Map<String, String> map = serviceMap.get(loader);
+ if (map != null && map.containsKey(filename))
{
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
+ return map.get(filename);
}
- return factoryName;
+ else
+ {
+ if (map == null)
+ {
+ map = new ConcurrentHashMap<String, String>();
+ serviceMap.put(loader, map);
+ }
+ InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
+ String factoryName = null;
+ if (inStream != null)
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
+ map.put(filename, factoryName);
+ }
+ return factoryName;
+ }
}
/** Use the system property
15 years, 11 months