11:02 a.m.
Author: richard.opalka(a)jboss.com
Date: 2012-09-20 05:02:57 -0400 (Thu, 20 Sep 2012)
New Revision: 16747
Added:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AbstractEndpointServlet.java
Modified:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/branches/ropalka_JBWS-3550/pom.xml
Log:
[JBWS-3550] removing useless classes
Modified:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
---
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-09-20
08:37:08 UTC (rev 16746)
+++
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-09-20
09:02:57 UTC (rev 16747)
@@ -282,23 +282,15 @@
{
synchronized(endpoint)
{
- Object endpointImpl = endpoint.getAttachment(Object.class);
- if (endpointImpl == null)
- {
- try
- {
- // create endpoint instance
- final Class<?> endpointImplClass = endpoint.getTargetBeanClass();
- endpointImpl =
endpoint.getInstanceProvider().getInstance(endpointImplClass.getName()).getValue();
- endpoint.addAttachment(Object.class, endpointImpl);
- }
- catch (Exception ex)
- {
- throw new IllegalStateException(BundleUtils.getMessage(bundle,
"CANNOT_CREATE_ENDPOINT_INSTANCE"), ex);
- }
- }
-
- return endpointImpl;
+ try
+ {
+ final String endpointClassName = endpoint.getTargetBeanName();
+ return
endpoint.getInstanceProvider().getInstance(endpointClassName).getValue();
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle,
"CANNOT_CREATE_ENDPOINT_INSTANCE"), ex);
+ }
}
}
Added:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AbstractEndpointServlet.java
===================================================================
---
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AbstractEndpointServlet.java
(rev 0)
+++
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AbstractEndpointServlet.java 2012-09-20
09:02:57 UTC (rev 16747)
@@ -0,0 +1,197 @@
+/*
+ * 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.jbws;
+
+import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
+
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ResourceBundle;
+
+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.ws.WSException;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.ObjectNameFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+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;
+
+/**
+ * A cross stack webservice endpoint servlet.
+ * @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 ResourceBundle bundle =
BundleUtils.getBundle(AbstractEndpointServlet.class);
+
+ protected Endpoint endpoint;
+ private 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);
+ }
+
+ /**
+ * 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
+ {
+ this.postService();
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /**
+ * Template method
+ */
+ protected void postService()
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Template method
+ * @param cfg servlet config
+ */
+ protected void postInit(ServletConfig cfg)
+ {
+ // 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.setRuntimeLoader();
+ this.postInit(servletConfig);
+ }
+
+ /**
+ * Initializes endpoint registry
+ */
+ private void initRegistry()
+ {
+ ClassLoader cl =
ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class,
cl).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 WSException(BundleUtils.getMessage(bundle,
"CANNOT_OBTAIN_ENDPOINT_FOR", oname));
+ }
+ }
+
+ /**
+ * Sets runtime classloader for JSE endpoints
+ */
+ private void setRuntimeLoader()
+ {
+ final Deployment dep = endpoint.getService().getDeployment();
+
+ if (isJseDeployment(dep))
+ {
+ ClassLoader classLoader = getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+
+ private static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+}
Modified:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
---
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-09-20
08:37:08 UTC (rev 16746)
+++
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-09-20
09:02:57 UTC (rev 16747)
@@ -31,9 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.logging.Logger;
-import org.jboss.ws.common.injection.InjectionHelper;
-import org.jboss.ws.common.injection.PreDestroyHolder;
-import org.jboss.ws.common.servlet.AbstractEndpointServlet;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.spi.management.EndpointResolver;
@@ -46,8 +43,6 @@
*/
public final class EndpointServlet extends AbstractEndpointServlet implements
ServletDelegate
{
- private List<PreDestroyHolder> preDestroyRegistry = new
LinkedList<PreDestroyHolder>();
- private final Object lock = new Object();
/**
* Provides Native specific endpoint resolver
@@ -62,50 +57,6 @@
}
@Override
- protected final void postService()
- {
- registerForPreDestroy(endpoint);
- }
-
- @Override
- public final void destroy()
- {
- synchronized(this.lock)
- {
- for (final PreDestroyHolder holder : this.preDestroyRegistry)
- {
- try
- {
- final Object targetBean = holder.getObject();
- InjectionHelper.callPreDestroyMethod(targetBean);
- }
- catch (Exception exception)
- {
-
Logger.getLogger(EndpointServlet.class).error(exception.getLocalizedMessage(),
exception);
- }
- }
- this.preDestroyRegistry.clear();
- }
- super.destroy();
- }
-
- private void registerForPreDestroy(Endpoint ep)
- {
- PreDestroyHolder holder =
(PreDestroyHolder)ep.getAttachment(PreDestroyHolder.class);
- if (holder != null)
- {
- synchronized(this.lock)
- {
- if (!this.preDestroyRegistry.contains(holder))
- {
- this.preDestroyRegistry.add(holder);
- }
- }
- ep.removeAttachment(PreDestroyHolder.class);
- }
- }
-
- @Override
public void doHead(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
throws ServletException, IOException
{
Modified:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
---
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-09-20
08:37:08 UTC (rev 16746)
+++
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-09-20
09:02:57 UTC (rev 16747)
@@ -26,3 +26,4 @@
ERROR_PROCESSING_WEB_SERVICE_REQUEST=Error processing web service request
CANNOT_LOAD_CLASS=Cannot load class: {0}
+CANNOT_OBTAIN_ENDPOINT_FOR=Cannot obtain endpoint for: {0}
\ No newline at end of file
Modified: stack/native/branches/ropalka_JBWS-3550/pom.xml
===================================================================
--- stack/native/branches/ropalka_JBWS-3550/pom.xml 2012-09-20 08:37:08 UTC (rev 16746)
+++ stack/native/branches/ropalka_JBWS-3550/pom.xml 2012-09-20 09:02:57 UTC (rev 16747)
@@ -57,10 +57,10 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.1.Beta3</jbossws.api.version>
- <jbossws.spi.version>2.1.0.Beta3</jbossws.spi.version>
- <jbossws.common.version>2.1.0.Beta3</jbossws.common.version>
+ <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
-
<jbossws.shared.testsuite.version>4.1.0.Beta2</jbossws.shared.testsuite.version>
+
<jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>