JBossWS SVN: r8361 - in framework/trunk/testsuite/test/java/org/jboss/test/ws: jaxws/jbws1733 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-06 20:23:32 -0400 (Mon, 06 Oct 2008)
New Revision: 8361
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/OrderMgmtBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java
Log:
Further fixes on @WebService
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -38,7 +38,7 @@
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
* @author Thomas.Diesler(a)jboss.com
*/
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", name = "Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org")
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org")
public class RegistrationServiceImpl implements Registration
{
// Provide logging
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -29,7 +29,7 @@
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
-@WebService(name = "JBWS1733", serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
+@WebService(serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
public class JBWS1733Impl implements JBWS1733
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -21,18 +21,17 @@
*/
package org.jboss.test.ws.jaxws.jbws1797;
-import javax.jws.WebParam;
import javax.jws.WebService;
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1797.IWebsvc", serviceName = "JBWS1797Service")
public class IWebsvcImpl implements IWebsvc
{
- public String submit(@WebParam(name = "foo") String foo)
+ public String submit(String foo)
{
return "submit-" + foo;
}
- public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar)
+ public String cancel(String foo, String bar)
{
return "cancel-" + foo + bar;
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/OrderMgmtBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/OrderMgmtBean.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/OrderMgmtBean.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -41,7 +41,7 @@
* that offers access though RMI and SOAP
*/
@Stateless
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.OrderMgmt", name = "OrderMgmt", serviceName = "OrderMgmtService")
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.OrderMgmt", serviceName = "OrderMgmtService")
@WebContext(contextRoot = "/jaxws-samples-retail")
@HandlerChain(file = "jaxws-handler.xml")
public class OrderMgmtBean implements OrderMgmt
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationBean.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationBean.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -29,7 +29,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
@Stateless
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.cc.CCVerification", name = "CCVerification")
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.cc.CCVerification")
@WebContext(contextRoot = "/jaxws-samples-retail")
//@HandlerChain(file = "../jaxws-handler.xml")
public class CCVerificationBean implements CCVerification
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtBean.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtBean.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -27,7 +27,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
@Stateless
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.profile.ProfileMgmt", name = "ProfileMgmt", serviceName = "ProfileMgmtService")
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.advanced.retail.profile.ProfileMgmt", serviceName = "ProfileMgmtService")
@WebContext(contextRoot = "/jaxws-samples-retail")
public class ProfileMgmtBean implements ProfileMgmt
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -31,7 +31,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-Aug-2005
*/
-@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.Endpoint")
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.Endpoint")
public class EndpointImpl
{
// Provide logging
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -31,7 +31,7 @@
* @author alessio.soldano(a)jboss.org
* @since 21-Feb-2008
*/
-@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.Endpoint")
+@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.Endpoint")
public class EndpointImpl
{
// Provide logging
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -23,7 +23,7 @@
import javax.jws.WebService;
-@WebService(name="Accessor", serviceName="AccessorService", endpointInterface="org.jboss.test.ws.jaxws.wrapped.accessor.Accessor")
+@WebService(serviceName="AccessorService", endpointInterface="org.jboss.test.ws.jaxws.wrapped.accessor.Accessor")
public class AccessorImpl implements Accessor
{
public String fieldAccessor(String one, int two)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -32,7 +32,7 @@
* @since 06-Aug-2008
*/
@Stateless
-@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
+@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl")
public class EndpointImpl
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java 2008-10-07 00:23:32 UTC (rev 8361)
@@ -33,7 +33,7 @@
* @since 06-Aug-2008
*/
@Stateless
-@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
+@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
@HandlerChain(file="jaxws-handlers-server.xml")
@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl")
public class EndpointWithHandlerImpl
17 years, 2 months
JBossWS SVN: r8360 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: samples/soapbinding and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-06 19:18:54 -0400 (Mon, 06 Oct 2008)
New Revision: 8360
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java
Log:
Fixing @WebService annotations
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-10-06 21:45:44 UTC (rev 8359)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-10-06 23:18:54 UTC (rev 8360)
@@ -33,12 +33,10 @@
* @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
*/
@WebService(
- name = "EndpointInterface",
targetNamespace = "http://www.openuri.org/2004/04/HelloWorld",
serviceName = "EndpointService",
endpointInterface = "org.jboss.test.ws.jaxws.jbws1841.EndpointInterface"
)
-@SOAPBinding(style = SOAPBinding.Style.RPC)
@Stateless
public class EJB3Bean implements EndpointInterface
{
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-10-06 21:45:44 UTC (rev 8359)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-10-06 23:18:54 UTC (rev 8360)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.ws.jaxws.jbws1841;
+import javax.ejb.Remote;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.ejb.Remote;
/**
* Test the JSR-181 javax.jws.WebService annotation on an SEI
@@ -32,7 +32,6 @@
* @since 29-Apr-2005
*/
@WebService(
- name = "EndpointInterface",
targetNamespace = "http://www.openuri.org/2004/04/HelloWorld"
)
@SOAPBinding(style = SOAPBinding.Style.RPC)
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java 2008-10-06 21:45:44 UTC (rev 8359)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.java 2008-10-06 23:18:54 UTC (rev 8360)
@@ -32,7 +32,7 @@
* @since 16-Oct-2005
*/
-@WebService(name="Example", serviceName="ExampleService", endpointInterface="org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI")
+@WebService(serviceName="ExampleService", endpointInterface="org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI")
public class ExampleServiceImpl
{
// Provide logging
17 years, 2 months
JBossWS SVN: r8359 - in stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws: jbws2206 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-06 17:45:44 -0400 (Mon, 06 Oct 2008)
New Revision: 8359
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java
Log:
Fixing usage of @WebService annotation
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java 2008-10-06 17:13:42 UTC (rev 8358)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/MetroTestServiceBean.java 2008-10-06 21:45:44 UTC (rev 8359)
@@ -27,7 +27,6 @@
@Stateless
@WebService(
endpointInterface="org.jboss.test.ws.jaxws.jbws2087.MetroTestPortType",
- name="MetroTestService",
targetNamespace = "http://com.acme.metroexceptiontest/",
serviceName = "MetroTestService"
)
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java 2008-10-06 17:13:42 UTC (rev 8358)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java 2008-10-06 21:45:44 UTC (rev 8359)
@@ -26,7 +26,6 @@
import javax.jws.soap.SOAPBinding;
@WebService(
- name = "MetroTestPortType",
targetNamespace = "http://com.acme.metroexceptiontest/"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java 2008-10-06 17:13:42 UTC (rev 8358)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java 2008-10-06 21:45:44 UTC (rev 8359)
@@ -27,9 +27,9 @@
@Stateless
@WebService(
endpointInterface="org.jboss.test.ws.jaxws.jbws2206.MetroTestPortType",
- name="MetroTestService",
targetNamespace = "http://com.acme.metroexceptiontest/",
serviceName = "MetroTestService",
+ portName = "MetroTestServicePort",
wsdlLocation="META-INF/wsdl/mtsb.wsdl"
)
public class MetroTestServiceBean implements MetroTestPortType
17 years, 2 months
JBossWS SVN: r8358 - in stack/cxf/trunk/modules/server/src/main: resources/jbossws-cxf-server.jar/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 13:13:42 -0400 (Mon, 06 Oct 2008)
New Revision: 8358
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AspectizedEndpointServlet.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] provide aspectized servlet + enhance BC compatible servlet
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AspectizedEndpointServlet.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AspectizedEndpointServlet.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AspectizedEndpointServlet.java 2008-10-06 17:13:42 UTC (rev 8358)
@@ -0,0 +1,67 @@
+/*
+ * 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 org.jboss.wsf.spi.DeploymentAspectManagerLocator;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+
+/**
+ * Endpoint servlet with WS framework aspects support called on servlet lifecycle methods
+ * @author richard.opalka(a)jboss.com
+ */
+public class AspectizedEndpointServlet extends EndpointServlet
+{
+
+ protected DeploymentAspectManager aspectsManager;
+
+ protected void initDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerLocator locator = spiProvider.getSPI(DeploymentAspectManagerLocator.class);
+ aspectsManager = locator.locateDeploymentAspectManager("WSServletAspectManager");
+ }
+
+ protected void callRuntimeAspects()
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.create(dep, null);
+ aspectsManager.start(dep, null);
+ }
+
+ public void destroy()
+ {
+ try
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.stop(dep, null);
+ aspectsManager.destroy(dep, null);
+ }
+ finally
+ {
+ super.destroy();
+ }
+ }
+
+}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-10-06 17:00:31 UTC (rev 8357)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-10-06 17:13:42 UTC (rev 8358)
@@ -41,8 +41,9 @@
import java.io.IOException;
/**
+ * A servlet that is installed for every web service endpoint.
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
+ * @author richard.opalka(a)jboss.com
*/
public class EndpointServlet extends HttpServlet
{
@@ -52,18 +53,20 @@
public void init(ServletConfig servletConfig) throws ServletException
{
super.init(servletConfig);
+ this.initRegistry();
+ this.initDeploymentAspectManager();
+ String contextPath = servletConfig.getServletContext().getContextPath();
+ this.initServiceEndpoint(contextPath);
+ }
+
+ protected void initRegistry()
+ {
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- }
+ }
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -80,7 +83,16 @@
*/
protected void initServiceEndpoint(String contextPath)
{
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.initEndpoint(contextPath, getServletName());
+ this.setRuntimeLoader();
+ this.callRuntimeAspects();
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initEndpoint(String contextPath, String servletName)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, servletName);
this.endpoint = epRegistry.resolve(resolver);
if (this.endpoint == null)
@@ -91,7 +103,10 @@
);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
-
+ }
+
+ private void setRuntimeLoader()
+ {
// Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
Deployment dep = endpoint.getService().getDeployment();
if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
@@ -100,4 +115,21 @@
dep.setRuntimeClassLoader(classLoader);
}
}
+
+ /**
+ * Template method
+ */
+ protected void initDeploymentAspectManager()
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Template method
+ */
+ protected void callRuntimeAspects()
+ {
+ // does nothing (because of BC)
+ }
+
}
Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2008-10-06 17:13:42 UTC (rev 8358)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
17 years, 2 months
JBossWS SVN: r8357 - in framework: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 13:00:31 -0400 (Mon, 06 Oct 2008)
New Revision: 8357
Added:
framework/tags/jbossws-framework-2.0.1.GA_CP02/
Removed:
framework/branches/jbossws-framework-2.0.1.GA_CP02/
Log:
[JBPAPP-1023] Tag jbossws-framework-2.0.1.GA_CP02
Copied: framework/tags/jbossws-framework-2.0.1.GA_CP02 (from rev 8356, framework/branches/jbossws-framework-2.0.1.GA_CP02)
17 years, 2 months
JBossWS SVN: r8356 - framework/branches/jbossws-framework-2.0.1.GA_CP02.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 12:56:48 -0400 (Mon, 06 Oct 2008)
New Revision: 8356
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP02/version.properties
Log:
[JBPAPP-1023] Set Framework version.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP02/version.properties
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP02/version.properties 2008-10-06 16:55:49 UTC (rev 8355)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP02/version.properties 2008-10-06 16:56:48 UTC (rev 8356)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_CP-SNAPSHOT
-repository.id=2.0.1.GA_CP-SNAPSHOT
+version.id=2.0.1.GA_CP02
+repository.id=2.0.1.GA_CP02
implementation.title=JBoss Web Services - Framework
implementation.url=http://www.jboss.org/products/jbossws
17 years, 2 months
JBossWS SVN: r8355 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 12:55:49 -0400 (Mon, 06 Oct 2008)
New Revision: 8355
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP02/
Log:
[JBPAPP-1023] Branch for release.
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP02 (from rev 8354, framework/branches/jbossws-framework-2.0.1.GA_CP)
17 years, 2 months
JBossWS SVN: r8354 - framework/branches/jbossws-framework-2.0.1.GA_CP.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 12:54:48 -0400 (Mon, 06 Oct 2008)
New Revision: 8354
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/version.properties
Log:
[JBPAPP-1023] Set SPI and Common versions.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/version.properties
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/version.properties 2008-10-06 16:38:52 UTC (rev 8353)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/version.properties 2008-10-06 16:54:48 UTC (rev 8354)
@@ -14,8 +14,8 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-common=1.0.0.GA_CP-SNAPSHOT
-jbossws-spi=1.0.0.GA_CP-SNAPSHOT
+jbossws-common=1.0.0.GA_CP02-brew
+jbossws-spi=1.0.0.GA_CP01-brew
dom4j=1.6.1
jboss-common-core=2.0.2.GA
17 years, 2 months
JBossWS SVN: r8353 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 12:38:52 -0400 (Mon, 06 Oct 2008)
New Revision: 8353
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] removed useless startEndpoint method + improved javadoc
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-06 16:37:22 UTC (rev 8352)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-06 16:38:52 UTC (rev 8353)
@@ -28,7 +28,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
/**
- * Endpoint servlet that has WS framework aspects support
+ * Endpoint servlet with WS framework aspects support called on servlet lifecycle methods
* @author richard.opalka(a)jboss.com
*/
public class AspectizedEndpointServlet extends EndpointServlet
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 2008-10-06 16:37:22 UTC (rev 8352)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-06 16:38:52 UTC (rev 8353)
@@ -29,9 +29,7 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
@@ -49,7 +47,6 @@
* A servlet that is installed for every web service endpoint.
* @author richard.opalka(a)jboss.com
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class EndpointServlet extends HttpServlet
{
@@ -65,7 +62,7 @@
this.initRegistry();
this.initDeploymentAspectManager();
String contextPath = servletConfig.getServletContext().getContextPath();
- initServiceEndpoint(contextPath);
+ this.initServiceEndpoint(contextPath);
}
protected void initRegistry()
@@ -74,22 +71,6 @@
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
}
- /**
- * Template method
- */
- protected void initDeploymentAspectManager()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method
- */
- protected void callRuntimeAspects()
- {
- // does nothing (because of BC)
- }
-
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
try
@@ -112,7 +93,6 @@
this.setRuntimeLoader();
this.callRuntimeAspects();
this.initEndpointConfig();
- this.startEndpoint();
}
private void setRuntimeLoader()
@@ -126,17 +106,6 @@
}
}
- private void startEndpoint()
- {
- // Start the endpoint
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
- {
- if (endpoint.getState() == EndpointState.CREATED)
- endpoint.getLifecycleHandler().start(endpoint);
- }
- }
-
private void initEndpointConfig()
{
// read the config name/file from web.xml
@@ -169,4 +138,21 @@
}
}
+
+ /**
+ * Template method
+ */
+ protected void initDeploymentAspectManager()
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Template method
+ */
+ protected void callRuntimeAspects()
+ {
+ // does nothing (because of BC)
+ }
+
}
17 years, 2 months
JBossWS SVN: r8352 - in stack/metro/trunk/modules/server/src/main: resources/jbossws-metro-server.jar/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 12:37:22 -0400 (Mon, 06 Oct 2008)
New Revision: 8352
Added:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] provide aspectized servlet + enhance BC compatible servlet
Added: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java 2008-10-06 16:37:22 UTC (rev 8352)
@@ -0,0 +1,67 @@
+/*
+ * 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.metro;
+
+import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+
+/**
+ * Endpoint servlet with WS framework aspects support called on servlet lifecycle methods
+ * @author richard.opalka(a)jboss.com
+ */
+public class AspectizedEndpointServlet extends EndpointServlet
+{
+
+ protected DeploymentAspectManager aspectsManager;
+
+ protected void initDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerLocator locator = spiProvider.getSPI(DeploymentAspectManagerLocator.class);
+ aspectsManager = locator.locateDeploymentAspectManager("WSServletAspectManager");
+ }
+
+ protected void callRuntimeAspects()
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.create(dep, null);
+ aspectsManager.start(dep, null);
+ }
+
+ public void destroy()
+ {
+ try
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.stop(dep, null);
+ aspectsManager.destroy(dep, null);
+ }
+ finally
+ {
+ super.destroy();
+ }
+ }
+
+}
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-10-06 16:04:51 UTC (rev 8351)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-10-06 16:37:22 UTC (rev 8352)
@@ -41,8 +41,9 @@
import java.io.IOException;
/**
+ * A servlet that is installed for every web service endpoint.
+ * @author richard.opalka(a)jboss.com
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
*/
public class EndpointServlet extends HttpServlet
{
@@ -52,18 +53,20 @@
public void init(ServletConfig servletConfig) throws ServletException
{
super.init(servletConfig);
+ this.initRegistry();
+ this.initDeploymentAspectManager();
+ String contextPath = servletConfig.getServletContext().getContextPath();
+ this.initServiceEndpoint(contextPath);
+ }
+
+ protected void initRegistry()
+ {
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -80,7 +83,14 @@
*/
protected void initServiceEndpoint(String contextPath)
{
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.initEndpoint(contextPath, getServletName());
+ this.setRuntimeLoader();
+ this.callRuntimeAspects();
+ }
+
+ private void initEndpoint(String contextPath, String servletName)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, servletName);
this.endpoint = epRegistry.resolve(resolver);
if (this.endpoint == null)
@@ -91,7 +101,10 @@
);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
-
+ }
+
+ private void setRuntimeLoader()
+ {
// Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
Deployment dep = endpoint.getService().getDeployment();
if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
@@ -100,4 +113,21 @@
dep.setRuntimeClassLoader(classLoader);
}
}
+
+ /**
+ * Template method
+ */
+ protected void initDeploymentAspectManager()
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Template method
+ */
+ protected void callRuntimeAspects()
+ {
+ // does nothing (because of BC)
+ }
+
}
Added: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2008-10-06 16:37:22 UTC (rev 8352)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
17 years, 2 months