JBossWS SVN: r8451 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 06:58:13 -0400 (Mon, 13 Oct 2008)
New Revision: 8451
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractAspectizedEndpointServlet.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractES + AbstractAspectizedES to common
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractAspectizedEndpointServlet.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractAspectizedEndpointServlet.java 2008-10-13 10:55:09 UTC (rev 8450)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractAspectizedEndpointServlet.java 2008-10-13 10:58:13 UTC (rev 8451)
@@ -1,141 +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.framework.deployment;
-
-import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
-
-/**
- * A cross stack aspectized webservice servlet that is installed for every web service endpoint on AS 5.x series
- * @author richard.opalka(a)jboss.com
- */
-public abstract class AbstractAspectizedEndpointServlet extends AbstractEndpointServlet
-{
-
- private static final String PROPERTY_NAME = "org.jboss.ws.webapp.ServletAspectManagerName";
- protected DeploymentAspectManager aspectsManager;
-
- /**
- * Constructor
- */
- protected AbstractAspectizedEndpointServlet() {}
-
- /**
- * Initializes aspect manager
- */
- @Override
- protected final void initAspectManager()
- {
- final String managerName = (String)this.endpoint.getService().getDeployment().getProperty(PROPERTY_NAME);
- if (managerName == null)
- throw new IllegalStateException("Endpoint servlet manager name must be specified with key: " + PROPERTY_NAME);
-
- final DeploymentAspectManagerLocator locator = this.spiProvider.getSPI(DeploymentAspectManagerLocator.class);
- this.aspectsManager = locator.locateDeploymentAspectManager(managerName);
- }
-
- /**
- * Starts servlet related aspects
- */
- @Override
- protected final void startAspectManager()
- {
- this.assertCorrectState();
-
- final Deployment dep = this.endpoint.getService().getDeployment();
-
- if (this.endpoint.getState() != EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
- {
- this.aspectsManager.create(dep, null);
- this.aspectsManager.start(dep, null);
- }
- }
-
- /**
- * Stops servlet related aspects
- */
- @Override
- protected final void stopAspectManager()
- {
- this.assertCorrectState();
-
- final Deployment dep = this.endpoint.getService().getDeployment();
-
- if (this.endpoint.getState() == EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
- {
- try
- {
- this.aspectsManager.stop(dep, null);
- this.aspectsManager.destroy(dep, null);
- }
- finally
- {
- this.aspectsManager = null;
- super.stopAspectManager();
- }
- }
- }
-
- /**
- * Fires endpoint start event
- */
- @Override
- protected final void startEndpoint()
- {
- Deployment dep = this.endpoint.getService().getDeployment();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.getLifecycleHandler().start(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
- }
- }
-
- /**
- * Fires endpoint stop event
- */
- @Override
- protected final void stopEndpoint()
- {
- if (this.endpoint.getState() == EndpointState.STARTED)
- {
- Deployment dep = this.endpoint.getService().getDeployment();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.getLifecycleHandler().stop(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
- }
- }
- }
-
- /**
- * Asserts this object correct state
- */
- private void assertCorrectState()
- {
- if (this.endpoint == null || this.aspectsManager == null)
- {
- throw new IllegalStateException();
- }
- }
-
-}
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-13 10:55:09 UTC (rev 8450)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-13 10:58:13 UTC (rev 8451)
@@ -1,223 +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.framework.deployment;
-
-import java.io.IOException;
-
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.wsf.common.ObjectNameFactory;
-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.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.EndpointResolver;
-
-import javax.xml.ws.WebServiceException;
-
-/**
- * A cross stack webservice servlet that is installed for every web service endpoint on AS 4.2.x series
- * @author thomas.diesler(a)jboss.org
- * @author heiko.braun(a)jboss.com
- * @author richard.opalka(a)jboss.com
- */
-public abstract class AbstractEndpointServlet extends HttpServlet
-{
-
- protected final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- /**
- * Constructor
- */
- protected AbstractEndpointServlet() {}
-
- /**
- * Servlet lifecycle init method
- * @param servletConfig servlet configuration
- */
- public final void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- this.initRegistry();
- this.initServiceEndpoint(servletConfig);
- }
-
- /**
- * Servlet lifecycle destroy method
- */
- public final void destroy()
- {
- try
- {
- this.stopAspectManager();
- this.stopEndpoint();
- }
- finally
- {
- super.destroy();
- }
- }
-
- /**
- * Serves the requests
- */
- public final void service(HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException
- {
- try
- {
- EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /**
- * Template method
- * @param cfg servlet config
- */
- protected void postInit(ServletConfig cfg)
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method for initializing aspect manager
- */
- protected void initAspectManager()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method for starting aspect manager
- */
- protected void startAspectManager()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method for stopping aspect manager
- */
- protected void stopAspectManager()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method to fire endpoint start event
- */
- protected void startEndpoint()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Template method to fire endpoint stop event
- */
- protected void stopEndpoint()
- {
- // does nothing (because of BC)
- }
-
- /**
- * Abstract method that must be overriden by each stack servlet endpoint
- * @param servletContext servlet context
- * @param servletName servlet name
- * @return new stack specific endpoint resolver
- */
- protected abstract EndpointResolver newEndpointResolver(String servletContext, String servletName);
-
- /**
- * Initialize the service endpoint
- */
- private void initServiceEndpoint(ServletConfig servletConfig)
- {
- this.initEndpoint(servletConfig.getServletContext().getContextPath(), getServletName());
- this.initAspectManager();
- this.setRuntimeLoader();
- this.startAspectManager();
- this.postInit(servletConfig);
- this.startEndpoint();
- }
-
- /**
- * Initializes endpoint registry
- */
- private void initRegistry()
- {
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- }
-
- /**
- * Initialize the service endpoint
- * @param contextPath context path
- * @param servletName servlet name
- */
- private void initEndpoint(String contextPath, String servletName)
- {
- final EndpointResolver resolver = newEndpointResolver(contextPath, servletName);
- this.endpoint = epRegistry.resolve(resolver);
-
- if (this.endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName
- );
- throw new WebServiceException("Cannot obtain endpoint for: " + oname);
- }
- }
-
- /**
- * Sets runtime classloader for JSE endpoints
- */
- private void setRuntimeLoader()
- {
- final Deployment dep = endpoint.getService().getDeployment();
- final boolean isJaxrpcJse = dep.getType() == Deployment.DeploymentType.JAXRPC_JSE;
- final boolean isJaxwsJse = dep.getType() == Deployment.DeploymentType.JAXWS_JSE;
-
- if (isJaxrpcJse || isJaxwsJse)
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- dep.setRuntimeClassLoader(classLoader);
- }
- }
-
-}
17 years, 2 months
JBossWS SVN: r8450 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 06:55:09 -0400 (Mon, 13 Oct 2008)
New Revision: 8450
Modified:
common/trunk/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] update classpath
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-10-13 10:51:57 UTC (rev 8449)
+++ common/trunk/pom.xml 2008-10-13 10:55:09 UTC (rev 8450)
@@ -69,6 +69,12 @@
<version>${jboss.microcontainer.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
17 years, 2 months
JBossWS SVN: r8449 - in common/trunk/src/main/java/org/jboss/wsf/common: servlet and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 06:51:57 -0400 (Mon, 13 Oct 2008)
New Revision: 8449
Added:
common/trunk/src/main/java/org/jboss/wsf/common/servlet/
common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractEndpointServlet from framework to common module
Added: common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-10-13 10:51:57 UTC (rev 8449)
@@ -0,0 +1,298 @@
+/*
+ * 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.common.servlet;
+
+import java.io.IOException;
+
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.wsf.common.ObjectNameFactory;
+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;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.EndpointResolver;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * A cross stack webservice endpoint servlet.
+ * Backward compatible mode is used on JBoss AS 4.2 series.
+ * Not backward compatible mode is used on JBoss AS 5.0 series
+ * @author thomas.diesler(a)jboss.org
+ * @author heiko.braun(a)jboss.com
+ * @author richard.opalka(a)jboss.com
+ */
+public abstract class AbstractEndpointServlet extends HttpServlet
+{
+
+ private static final String PROPERTY_NAME = "org.jboss.ws.webapp.ServletAspectManagerName";
+ private final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ protected Endpoint endpoint;
+ private EndpointRegistry epRegistry;
+ private DeploymentAspectManager aspectsManager;
+ private boolean backwardCompatibilityMode;
+
+ /**
+ * Constructor
+ */
+ protected AbstractEndpointServlet() {}
+
+ /**
+ * Servlet lifecycle init method
+ * @param servletConfig servlet configuration
+ */
+ public final void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ this.initRegistry();
+ this.initServiceEndpoint(servletConfig);
+ }
+
+ /**
+ * Servlet lifecycle destroy method
+ */
+ public final void destroy()
+ {
+ try
+ {
+ this.stopAspectManager();
+ this.stopEndpoint();
+ }
+ finally
+ {
+ super.destroy();
+ }
+ }
+
+ /**
+ * Serves the requests
+ */
+ public final void service(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException
+ {
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /**
+ * Template method
+ * @param cfg servlet config
+ */
+ protected void postInit(ServletConfig cfg)
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Initializes aspect manager if not backward compatible mode
+ */
+ private void initAspectManager()
+ {
+ final String managerName = (String)this.endpoint.getService().getDeployment().getProperty(PROPERTY_NAME);
+ if (managerName == null)
+ {
+ this.backwardCompatibilityMode = true;
+ }
+
+ if (!this.backwardCompatibilityMode)
+ {
+ final DeploymentAspectManagerLocator locator = this.spiProvider.getSPI(DeploymentAspectManagerLocator.class);
+ this.aspectsManager = locator.locateDeploymentAspectManager(managerName);
+ }
+ }
+
+ /**
+ * Starts servlet related aspects if not backward compatible mode
+ */
+ private void startAspectManager()
+ {
+ if (!this.backwardCompatibilityMode)
+ {
+ this.assertCorrectState();
+
+ final Deployment dep = this.endpoint.getService().getDeployment();
+
+ if (this.endpoint.getState() != EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
+ {
+ this.aspectsManager.create(dep, null);
+ this.aspectsManager.start(dep, null);
+ }
+ }
+ }
+
+ /**
+ * Stops servlet related aspects if not backward compatible mode
+ */
+ private void stopAspectManager()
+ {
+ if (!this.backwardCompatibilityMode)
+ {
+ this.assertCorrectState();
+
+ final Deployment dep = this.endpoint.getService().getDeployment();
+
+ if (this.endpoint.getState() == EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
+ {
+ try
+ {
+ this.aspectsManager.stop(dep, null);
+ this.aspectsManager.destroy(dep, null);
+ }
+ finally
+ {
+ this.aspectsManager = null;
+ }
+ }
+ }
+ }
+
+ /**
+ * Fires endpoint start event if not backward compatible mode
+ */
+ private void startEndpoint()
+ {
+ if (!this.backwardCompatibilityMode)
+ {
+ Deployment dep = this.endpoint.getService().getDeployment();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ ep.getLifecycleHandler().start(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
+ }
+ }
+ }
+
+ /**
+ * Fires endpoint stop event if not backward compatible mode
+ */
+ private void stopEndpoint()
+ {
+ if (!this.backwardCompatibilityMode)
+ {
+ if (this.endpoint.getState() == EndpointState.STARTED)
+ {
+ Deployment dep = this.endpoint.getService().getDeployment();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ ep.getLifecycleHandler().stop(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
+ }
+ }
+ }
+ }
+
+ /**
+ * Abstract method that must be overriden by each stack servlet endpoint
+ * @param servletContext servlet context
+ * @param servletName servlet name
+ * @return new stack specific endpoint resolver
+ */
+ protected abstract EndpointResolver newEndpointResolver(String servletContext, String servletName);
+
+ /**
+ * Initialize the service endpoint
+ */
+ private void initServiceEndpoint(ServletConfig servletConfig)
+ {
+ this.initEndpoint(servletConfig.getServletContext().getContextPath(), getServletName());
+ this.initAspectManager();
+ this.setRuntimeLoader();
+ this.startAspectManager();
+ this.postInit(servletConfig);
+ this.startEndpoint();
+ }
+
+ /**
+ * Initializes endpoint registry
+ */
+ private void initRegistry()
+ {
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ }
+
+ /**
+ * Initialize the service endpoint
+ * @param contextPath context path
+ * @param servletName servlet name
+ */
+ private void initEndpoint(String contextPath, String servletName)
+ {
+ final EndpointResolver resolver = newEndpointResolver(contextPath, servletName);
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+ }
+
+ /**
+ * Sets runtime classloader for JSE endpoints
+ */
+ private void setRuntimeLoader()
+ {
+ final Deployment dep = endpoint.getService().getDeployment();
+ final boolean isJaxrpcJse = dep.getType() == Deployment.DeploymentType.JAXRPC_JSE;
+ final boolean isJaxwsJse = dep.getType() == Deployment.DeploymentType.JAXWS_JSE;
+
+ if (isJaxrpcJse || isJaxwsJse)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+
+ /**
+ * Asserts this object correct state
+ */
+ private void assertCorrectState()
+ {
+ if (this.endpoint == null || this.aspectsManager == null)
+ {
+ throw new IllegalStateException();
+ }
+ }
+
+}
17 years, 2 months
JBossWS SVN: r8448 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 05:36:04 -0400 (Mon, 13 Oct 2008)
New Revision: 8448
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
Log:
Removing useless import
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-13 09:35:11 UTC (rev 8447)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-13 09:36:04 UTC (rev 8448)
@@ -45,7 +45,6 @@
import javax.xml.ws.soap.MTOMFeature;
import javax.xml.ws.soap.SOAPBinding;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.xml.sax.EntityResolver;
import com.sun.xml.ws.api.BindingID;
17 years, 2 months
JBossWS SVN: r8447 - in stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 05:35:11 -0400 (Mon, 13 Oct 2008)
New Revision: 8447
Added:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/Constants.java
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
[JBWS-2129] Moving wrapper gen invocation to DeploymentDescriptorParserJBWS and adding property to disable wrapper gen
Added: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/Constants.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/Constants.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/Constants.java 2008-10-13 09:35:11 UTC (rev 8447)
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+/**
+ * A collection of constants relevant to JBossWS-Metro
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public interface Constants
+{
+ public static final String NO_WRAPPERS_GENERATION = "org.jboss.wsf.stack.metro.noWrappersGeneration";
+}
Property changes on: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-13 08:08:44 UTC (rev 8446)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-13 09:35:11 UTC (rev 8447)
@@ -25,30 +25,21 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.ws.WebFault;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.MTOMFeature;
@@ -115,8 +106,6 @@
private final ResourceLoader loader;
private final AdapterFactory<A> adapterFactory;
- private UnifiedVirtualFile archiveFile;
-
private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
/**
@@ -311,15 +300,8 @@
ensureNoContent(reader);
Invoker invoker = createInvoker(implementorClass);
+ generateWrappers(implementorClass, this.classLoader);
- //Generate wrappers
- if (isWrapperGenerationRequired(implementorClass, reader, this.classLoader))
- {
- WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
- ClassLoader newClassLoader = wrapperGenerator.generate(implementationName, classLoader, archiveFile.toURL());
- Thread.currentThread().setContextClassLoader(newClassLoader);
- }
-
WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
@@ -331,67 +313,16 @@
return adapters;
}
- private boolean isWrapperGenerationRequired(Class<?> endpoint, XMLStreamReader reader, ClassLoader classLoader)
- {
- WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class);
- if (webServiceAnnotation == null)
- return false;
- String wsdlLocation = webServiceAnnotation.wsdlLocation();
- if (wsdlLocation != null && !"".equals(wsdlLocation))
- return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
-
- String endpointInterface = webServiceAnnotation.endpointInterface();
- javax.jws.soap.SOAPBinding soapBinding;
- if (endpointInterface == null || "".equalsIgnoreCase(endpointInterface))
- {
- if (isFaultWrapperGenerationRequired(endpoint))
- return true;
- soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
- }
- else
- {
- //Using the SEI to get annotations
- Class<?> sei = getImplementorClass(endpointInterface, reader, classLoader);
- if (isFaultWrapperGenerationRequired(sei))
- return true;
- soapBinding = sei.getAnnotation(javax.jws.soap.SOAPBinding.class);
- }
- if (soapBinding == null)
- return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
- return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
- }
-
- private boolean isFaultWrapperGenerationRequired(Class<?> clazz)
- {
- Method[] classMethods = clazz.getMethods();
- boolean webMethodAnnUsed = false;
- List<Method> webMethods = new LinkedList<Method>();
- for (Method m : classMethods)
- {
- if (m.getAnnotation(WebMethod.class) != null)
- {
- webMethods.add(m);
- webMethodAnnUsed = true;
- }
- }
- List<Method> methods = webMethodAnnUsed ? webMethods : Arrays.asList(classMethods);
- for (Method m : methods)
- {
- Class<?>[] exceptionClasses = m.getExceptionTypes();
- for (Class<?> exceptionClass : exceptionClasses)
- {
- if (exceptionClass.getAnnotation(WebFault.class) != null)
- return true;
- }
- }
- return false;
- }
-
protected Invoker createInvoker(Class<?> implementorClass)
{
Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker();
return invoker;
}
+
+ protected void generateWrappers(Class<?> implementorClass, ClassLoader classLoader)
+ {
+ //default implementation does nothing
+ }
/**
* @param ddBindingId
@@ -675,9 +606,4 @@
throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
}
}
-
- public void setArchiveFile(UnifiedVirtualFile file)
- {
- this.archiveFile = file;
- }
}
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-10-13 08:08:44 UTC (rev 8446)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-10-13 09:35:11 UTC (rev 8447)
@@ -21,10 +21,24 @@
*/
package org.jboss.wsf.stack.metro;
+import java.lang.reflect.Method;
import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding.Use;
+import javax.xml.ws.WebFault;
+import javax.xml.ws.WebServiceException;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+
import com.sun.xml.ws.api.server.Container;
import com.sun.xml.ws.api.server.InstanceResolver;
import com.sun.xml.ws.api.server.Invoker;
@@ -35,12 +49,16 @@
* A copy of DeploymentDescriptorParser that externalizes
*
* createInvoker(Class)
+ * generateWrappers(Class, XMLStreamReader, ClassLoader)
*
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.org
* @since 10-May-2007
*/
public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A>
{
+ private UnifiedVirtualFile archiveFile;
+
public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
{
super(cl, loader, container, adapterFactory);
@@ -61,5 +79,93 @@
}
return invoker;
}
-
+
+ @Override
+ protected void generateWrappers(Class<?> implementorClass, ClassLoader classLoader)
+ {
+ //Generate wrappers
+ if (isWrapperGenerationEnabled() && isWrapperGenerationRequired(implementorClass, classLoader))
+ {
+ WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
+ ClassLoader newClassLoader = wrapperGenerator.generate(implementorClass.getName(), classLoader, archiveFile.toURL());
+ Thread.currentThread().setContextClassLoader(newClassLoader);
+ }
+ }
+
+ private boolean isWrapperGenerationEnabled()
+ {
+ boolean noWrappersGeneration = "true".equalsIgnoreCase(System.getProperty(Constants.NO_WRAPPERS_GENERATION));
+ if (noWrappersGeneration)
+ Logger.getLogger(this.getClass()).debug("Wrapper generation disabled");
+ return !noWrappersGeneration;
+ }
+
+ private boolean isWrapperGenerationRequired(Class<?> endpoint, ClassLoader classLoader)
+ {
+ WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class);
+ if (webServiceAnnotation == null)
+ return false;
+ String wsdlLocation = webServiceAnnotation.wsdlLocation();
+ if (wsdlLocation != null && !"".equals(wsdlLocation))
+ return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
+
+ String endpointInterface = webServiceAnnotation.endpointInterface();
+ javax.jws.soap.SOAPBinding soapBinding;
+ if (endpointInterface == null || "".equalsIgnoreCase(endpointInterface))
+ {
+ if (isFaultWrapperGenerationRequired(endpoint))
+ return true;
+ soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ }
+ else
+ {
+ //Using the SEI to get annotations
+ Class<?> sei;
+ try
+ {
+ sei = Class.forName(endpointInterface, true, classLoader);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new WebServiceException(e);
+ }
+ if (isFaultWrapperGenerationRequired(sei))
+ return true;
+ soapBinding = sei.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ }
+ if (soapBinding == null)
+ return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
+ return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
+ }
+
+ private boolean isFaultWrapperGenerationRequired(Class<?> clazz)
+ {
+ Method[] classMethods = clazz.getMethods();
+ boolean webMethodAnnUsed = false;
+ List<Method> webMethods = new LinkedList<Method>();
+ for (Method m : classMethods)
+ {
+ if (m.getAnnotation(WebMethod.class) != null)
+ {
+ webMethods.add(m);
+ webMethodAnnUsed = true;
+ }
+ }
+ List<Method> methods = webMethodAnnUsed ? webMethods : Arrays.asList(classMethods);
+ for (Method m : methods)
+ {
+ Class<?>[] exceptionClasses = m.getExceptionTypes();
+ for (Class<?> exceptionClass : exceptionClasses)
+ {
+ if (exceptionClass.getAnnotation(WebFault.class) != null)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public void setArchiveFile(UnifiedVirtualFile file)
+ {
+ this.archiveFile = file;
+ }
}
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-13 08:08:44 UTC (rev 8446)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-13 09:35:11 UTC (rev 8447)
@@ -103,15 +103,12 @@
// Parse the descriptor file and build endpoint infos
DeploymentDescriptorParserExt<ServletAdapter> parser =
- createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
+ createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList, vfsRoot);
- parser.setArchiveFile(vfsRoot);
-
URL sunJaxWsXml = getDDUrlFromContext(deployment);
List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
-
for(ServletAdapter adapter : adapters)
{
for(Endpoint ep : deployment.getService().getEndpoints())
@@ -159,14 +156,14 @@
ClassLoader classLoader,
JBossWSContainer container,
ResourceLoader resourceLoader,
- DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList
+ DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList,
+ UnifiedVirtualFile vfsRoot
)
throws MalformedURLException
{
- return new DeploymentDescriptorParserJBWS<ServletAdapter>
- (
- classLoader, resourceLoader, container, adapterList
- );
+ DeploymentDescriptorParserJBWS<ServletAdapter> parser = new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList);
+ parser.setArchiveFile(vfsRoot);
+ return parser;
}
/**
17 years, 2 months
JBossWS SVN: r8446 - stack/metro/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 04:08:44 -0400 (Mon, 13 Oct 2008)
New Revision: 8446
Removed:
stack/metro/branches/asoldano/
Log:
Removing user branch not required anymore
17 years, 2 months
JBossWS SVN: r8445 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 09:01:43 -0400 (Sat, 11 Oct 2008)
New Revision: 8445
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2242][JBWS-2243][JBWS-2129] Fixing excludes for AS 5
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-11 12:53:36 UTC (rev 8444)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-11 13:01:43 UTC (rev 8445)
@@ -9,10 +9,22 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2343] Enable tests requiring atp/wsgen on client side
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -24,26 +36,20 @@
org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1797/**
org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2241/**
org/jboss/test/ws/jaxws/jbws2250/**
+
+# [JBWS-2344][JBWS-2342] These tests currently run fine with JDK6 only
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws860/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-11 12:53:36 UTC (rev 8444)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-11 13:01:43 UTC (rev 8445)
@@ -9,10 +9,22 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2343] Enable tests requiring atp/wsgen on client side
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -24,26 +36,20 @@
org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1797/**
org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2241/**
org/jboss/test/ws/jaxws/jbws2250/**
+
+# [JBWS-2344][JBWS-2342] These tests currently run fine with JDK6 only
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws860/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
17 years, 2 months
JBossWS SVN: r8444 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 08:53:36 -0400 (Sat, 11 Oct 2008)
New Revision: 8444
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
Log:
[JBWS-2129] Fixing excludes for AS 4.2.2 and AS 4.2.3
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-11 12:40:39 UTC (rev 8443)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-11 12:53:36 UTC (rev 8444)
@@ -17,7 +17,23 @@
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
-# [JBWS-2129] Wrapper class is not found
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
+org/jboss/test/ws/jaxws/jbws2241/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2343] Enable tests requiring atp/wsgen on client side
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -29,30 +45,17 @@
org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1797/**
org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-11 12:40:39 UTC (rev 8443)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-11 12:53:36 UTC (rev 8444)
@@ -14,7 +14,23 @@
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
-# [JBWS-2129] Wrapper class is not found
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
+org/jboss/test/ws/jaxws/jbws2241/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2343] Enable tests requiring atp/wsgen on client side
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -26,30 +42,17 @@
org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1797/**
org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
17 years, 2 months
JBossWS SVN: r8443 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 08:40:39 -0400 (Sat, 11 Oct 2008)
New Revision: 8443
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
[JBWS-2129] Updating exclude file for AS 4.2 trunk
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-11 11:58:27 UTC (rev 8442)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-11 12:40:39 UTC (rev 8443)
@@ -14,7 +14,23 @@
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
-# [JBWS-2129] Wrapper class is not found
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
+org/jboss/test/ws/jaxws/jbws2241/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2343] Enable tests requiring atp/wsgen on client side
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -26,30 +42,17 @@
org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1797/**
org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1822/**
org/jboss/test/ws/jaxws/jbws1845/**
org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
17 years, 2 months
JBossWS SVN: r8442 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1762/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 07:58:27 -0400 (Sat, 11 Oct 2008)
New Revision: 8442
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java
Log:
[JBWS-2135] Fixing annotation usage
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-10-11 11:44:02 UTC (rev 8441)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-10-11 11:58:27 UTC (rev 8442)
@@ -265,6 +265,7 @@
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.class"/>
</fileset>
</jar>
<mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/>
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2008-10-11 11:44:02 UTC (rev 8441)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2008-10-11 11:58:27 UTC (rev 8442)
@@ -29,14 +29,12 @@
* @since Oct 17, 2007
*/
import javax.ejb.Stateless;
-import javax.jws.WebMethod;
import javax.jws.WebService;
@Stateless
-@WebService(name = "JBWS1762EJB3", serviceName = "JBWS1762EJB3Service")
+@WebService(serviceName = "JBWS1762EJB3Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1762.services.EJB3Iface")
public class EJB3Bean
{
- @WebMethod
public String echo(String msg)
{
return msg;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java 2008-10-11 11:44:02 UTC (rev 8441)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java 2008-10-11 11:58:27 UTC (rev 8442)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws1762.services;
+import javax.jws.WebMethod;
import javax.jws.WebService;
/**
@@ -33,5 +34,6 @@
@WebService
public interface EJB3Iface
{
+ @WebMethod
public String echo(String msg);
}
17 years, 2 months