JBossWS SVN: r13374 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-02 05:31:39 -0500 (Thu, 02 Dec 2010)
New Revision: 13374
Added:
spi/tags/jbossws-spi-1.4.1.CR3/
Log:
Tagging jbossws-spi-1.4.1.CR3
Copied: spi/tags/jbossws-spi-1.4.1.CR3 (from rev 13373, spi/branches/jbossws-spi-1.4.1)
13 years, 4 months
JBossWS SVN: r13373 - in spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata: jms and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-12-02 05:28:46 -0500 (Thu, 02 Dec 2010)
New Revision: 13373
Added:
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorParser.java
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorParser.java
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorParser.java
Modified:
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java
spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java
Log:
[JBWS-3169] Deprecating DescriptorProcessor interfaces (as they directly reference XB) in jbossws-spi 1.4.1; adding new DescriptorParser interfaces
Added: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorParser.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorParser.java (rev 0)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorParser.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata;
+
+import java.net.URL;
+
+/**
+ *
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author alessio.soldano(a)jboss.com
+ */
+public interface DescriptorParser<T>
+{
+ /**
+ * Descriptor name to parse and process.
+ * @return descriptor name to consume.
+ */
+ String getDescriptorName();
+
+ /**
+ * Parses the descriptor at the provided URL and returns
+ * the corresponding object (metadata)
+ *
+ * @param url
+ * @return
+ */
+ T parse(final URL url);
+}
Modified: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java 2010-12-01 16:54:17 UTC (rev 13372)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -27,9 +27,11 @@
/**
* Descriptor processor is abstraction over configuration procesing.
+ * @deprecated This will be replaced by {@link org.jboss.wsf.spi.metadata.DescriptorParser} interface.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
+@Deprecated
public interface DescriptorProcessor<T>
{
/**
Added: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorParser.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorParser.java (rev 0)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorParser.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.jms;
+
+import org.jboss.wsf.spi.metadata.DescriptorParser;
+
+/**
+ * Parser for JMS UMDM.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+public interface JMSDescriptorParser extends DescriptorParser<JMSEndpointsMetaData>
+{
+}
Modified: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java 2010-12-01 16:54:17 UTC (rev 13372)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -25,9 +25,11 @@
/**
* Processor for JMS UMDM.
+ * @deprecated To be replaced by {@link org.jboss.wsf.spi.metadata.jms.JMSDescriptorParser}
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
+@Deprecated
public interface JMSDescriptorProcessor extends DescriptorProcessor<JMSEndpointsMetaData>
{
}
Added: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorParser.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorParser.java (rev 0)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorParser.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.webservices;
+
+import org.jboss.wsf.spi.metadata.DescriptorParser;
+
+/**
+ * Parser for WS UMDM.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+public interface WebservicesDescriptorParser extends DescriptorParser<WebservicesMetaData>
+{
+}
Modified: spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java
===================================================================
--- spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java 2010-12-01 16:54:17 UTC (rev 13372)
+++ spi/branches/jbossws-spi-1.4.1/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java 2010-12-02 10:28:46 UTC (rev 13373)
@@ -27,7 +27,9 @@
* Processor for WS UMDM.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @deprecated To be replaced by {@link org.jboss.wsf.spi.metadata.webservices.DescriptorParser}
*/
+@Deprecated
public interface WebservicesDescriptorProcessor extends DescriptorProcessor<WebservicesMetaData>
{
}
13 years, 4 months
JBossWS SVN: r13372 - stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-01 11:54:17 -0500 (Wed, 01 Dec 2010)
New Revision: 13372
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
[JBPAPP-5489] CXF integration initialises endpoints multiple times.
Modified: stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-12-01 16:14:21 UTC (rev 13371)
+++ stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-12-01 16:54:17 UTC (rev 13372)
@@ -67,6 +67,10 @@
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
+ private static final String CHILD_CONTEXT_ATTRIBUTE = "jbossws.cxf.childCtx";
+ private static final String BUS_ATTRIBUTE = "jbossws.cxf.bus";
+ private static final String CONTROLLER_ATTRIBUTE = "jbossws.cxf.controller";
+
private static Logger log = Logger.getLogger(CXFServletExt.class);
protected Endpoint endpoint;
@@ -78,7 +82,7 @@
{
super.init(servletConfig);
}
-
+
@Override
public ServletController createServletController(ServletConfig servletConfig)
{
@@ -89,24 +93,44 @@
@Override
public void loadBus(ServletConfig servletConfig) throws ServletException
{
- super.loadBus(servletConfig);
-
ServletContext svCtx = getServletContext();
- ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
+ synchronized (svCtx)
+ {
+ Bus bus = (Bus)svCtx.getAttribute(BUS_ATTRIBUTE);
+ if (bus != null)
+ {
+ this.bus = bus;
+ controller = (ServletController)svCtx.getAttribute(CONTROLLER_ATTRIBUTE);
+ }
+ else
+ {
+ super.loadBus(servletConfig);
+ bus = getBus();
+ svCtx.setAttribute(BUS_ATTRIBUTE, bus);
+ svCtx.setAttribute(CONTROLLER_ATTRIBUTE, getController());
+ svCtx.setAttribute(ServletController.class.getName(), getController());
+ }
- Bus bus = getBus();
- //Install our SoapTransportFactory to allow for proper soap address rewrite
- DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
- SoapTransportFactory factory = new SoapTransportFactoryExt();
- factory.setBus(bus);
- dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
- dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+ ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
- //Init the Endpoint
- initEndpoint(servletConfig);
-
- //Load additional configurations
- loadAdditionalConfigExt(appCtx, servletConfig);
+ //Install our SoapTransportFactory to allow for proper soap address rewrite
+ DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+ SoapTransportFactory factory = new SoapTransportFactoryExt();
+ factory.setBus(bus);
+ dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
+ dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+
+ //Init the Endpoint
+ initEndpoint(servletConfig);
+
+ childCtx = (GenericApplicationContext)svCtx.getAttribute(CHILD_CONTEXT_ATTRIBUTE);
+ if (childCtx == null)
+ {
+ //Load additional configurations
+ loadAdditionalConfigExt(appCtx, servletConfig);
+ svCtx.setAttribute(CHILD_CONTEXT_ATTRIBUTE, childCtx);
+ }
+ }
}
private void initEndpoint(ServletConfig servletConfig)
@@ -117,15 +141,13 @@
ServletContext context = servletConfig.getServletContext();
String contextPath = context.getContextPath();
endpoint = initServiceEndpoint(contextPath);
-
+
//Install the JBossWS resource resolver
ResourceResolver resourceResolver = endpoint.getAttachment(ResourceResolver.class);
if (resourceResolver != null)
{
bus.getExtension(ResourceManager.class).addResourceResolver(resourceResolver);
}
-
- context.setAttribute(ServletController.class.getName(), getController());
}
private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException
@@ -151,7 +173,7 @@
childCtx.refresh();
}
}
-
+
@Override
protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
{
@@ -177,7 +199,10 @@
public void destroy()
{
if (childCtx != null)
+ {
childCtx.destroy();
+ childCtx = null;
+ }
super.destroy();
}
13 years, 4 months
JBossWS SVN: r13371 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-01 11:14:21 -0500 (Wed, 01 Dec 2010)
New Revision: 13371
Added:
stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489/
Log:
[JBPAPP-5489] Branch for patch.
Copied: stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-5489 (from rev 13370, stack/cxf/tags/jbossws-cxf-3.1.2.SP7)
13 years, 4 months
JBossWS SVN: r13370 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-01 11:07:44 -0500 (Wed, 01 Dec 2010)
New Revision: 13370
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
[JBPAPP-5488] CXF integration initialises endpoints multiple times.
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-11-30 17:27:30 UTC (rev 13369)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-12-01 16:07:44 UTC (rev 13370)
@@ -67,6 +67,10 @@
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
+ private static final String CHILD_CONTEXT_ATTRIBUTE = "jbossws.cxf.childCtx";
+ private static final String BUS_ATTRIBUTE = "jbossws.cxf.bus";
+ private static final String CONTROLLER_ATTRIBUTE = "jbossws.cxf.controller";
+
private static Logger log = Logger.getLogger(CXFServletExt.class);
protected Endpoint endpoint;
@@ -78,7 +82,7 @@
{
super.init(servletConfig);
}
-
+
@Override
public ServletController createServletController(ServletConfig servletConfig)
{
@@ -89,24 +93,44 @@
@Override
public void loadBus(ServletConfig servletConfig) throws ServletException
{
- super.loadBus(servletConfig);
-
ServletContext svCtx = getServletContext();
- ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
+ synchronized (svCtx)
+ {
+ Bus bus = (Bus)svCtx.getAttribute(BUS_ATTRIBUTE);
+ if (bus != null)
+ {
+ this.bus = bus;
+ controller = (ServletController)svCtx.getAttribute(CONTROLLER_ATTRIBUTE);
+ }
+ else
+ {
+ super.loadBus(servletConfig);
+ bus = getBus();
+ svCtx.setAttribute(BUS_ATTRIBUTE, bus);
+ svCtx.setAttribute(CONTROLLER_ATTRIBUTE, getController());
+ svCtx.setAttribute(ServletController.class.getName(), getController());
+ }
- Bus bus = getBus();
- //Install our SoapTransportFactory to allow for proper soap address rewrite
- DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
- SoapTransportFactory factory = new SoapTransportFactoryExt();
- factory.setBus(bus);
- dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
- dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+ ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
- //Init the Endpoint
- initEndpoint(servletConfig);
-
- //Load additional configurations
- loadAdditionalConfigExt(appCtx, servletConfig);
+ //Install our SoapTransportFactory to allow for proper soap address rewrite
+ DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+ SoapTransportFactory factory = new SoapTransportFactoryExt();
+ factory.setBus(bus);
+ dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
+ dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+
+ //Init the Endpoint
+ initEndpoint(servletConfig);
+
+ childCtx = (GenericApplicationContext)svCtx.getAttribute(CHILD_CONTEXT_ATTRIBUTE);
+ if (childCtx == null)
+ {
+ //Load additional configurations
+ loadAdditionalConfigExt(appCtx, servletConfig);
+ svCtx.setAttribute(CHILD_CONTEXT_ATTRIBUTE, childCtx);
+ }
+ }
}
private void initEndpoint(ServletConfig servletConfig)
@@ -117,15 +141,13 @@
ServletContext context = servletConfig.getServletContext();
String contextPath = context.getContextPath();
endpoint = initServiceEndpoint(contextPath);
-
+
//Install the JBossWS resource resolver
ResourceResolver resourceResolver = endpoint.getAttachment(ResourceResolver.class);
if (resourceResolver != null)
{
bus.getExtension(ResourceManager.class).addResourceResolver(resourceResolver);
}
-
- context.setAttribute(ServletController.class.getName(), getController());
}
private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException
@@ -151,7 +173,7 @@
childCtx.refresh();
}
}
-
+
@Override
protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
{
@@ -177,7 +199,10 @@
public void destroy()
{
if (childCtx != null)
+ {
childCtx.destroy();
+ childCtx = null;
+ }
super.destroy();
}
13 years, 4 months