6:21 a.m.
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 07:21:41 -0400 (Mon, 13 Oct 2008)
New Revision: 8453
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractES + AbstractAspectizedES to common
Deleted:
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-13
11:03:39 UTC (rev 8452)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-13
11:21:41 UTC (rev 8453)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.jbws;
-
-import javax.servlet.ServletConfig;
-
-import org.jboss.wsf.framework.deployment.AbstractAspectizedEndpointServlet;
-import org.jboss.wsf.spi.management.EndpointResolver;
-
-/**
- * An aspectized Native endpoint servlet that is installed for every web service endpoint
on AS 5.x series
- * @author richard.opalka(a)jboss.com
- */
-public final class AspectizedEndpointServlet extends AbstractAspectizedEndpointServlet
-{
-
- /**
- * Provides Native specific endpoint resolver
- * @param servletContext servlet context
- * @param servletName servlet name
- * @return new Native specific endpoint resolver
- */
- @Override
- protected final EndpointResolver newEndpointResolver(String servletContext, String
servletName)
- {
- return new WebAppResolver(servletContext, servletName);
- }
-
- /**
- * Post init phase hook using template method
- * @param servletConfig servlet config
- */
- @Override
- protected final void postInit(ServletConfig servletConfig)
- {
- ServletConfigHelper.initEndpointConfig(servletConfig, endpoint);
- }
-
-}
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-13
11:03:39 UTC (rev 8452)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-13
11:21:41 UTC (rev 8453)
@@ -21,13 +21,13 @@
*/
package org.jboss.wsf.stack.jbws;
-import org.jboss.wsf.framework.deployment.AbstractEndpointServlet;
import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
import javax.servlet.ServletConfig;
/**
- * A Native endpoint servlet that is installed for every web service endpoint on AS 4.2.x
series
+ * A Native endpoint servlet that is installed for every web service endpoint
* @author thomas.diesler(a)jboss.com
* @author heiko.braun(a)jboss.com
* @author richard.opalka(a)jboss.com
Modified:
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
===================================================================
---
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-13
11:03:39 UTC (rev 8452)
+++
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-13
11:21:41 UTC (rev 8453)
@@ -47,7 +47,7 @@
<property
name="provides">ContextProperties,StackDescriptor</property>
<property name="contextProperties">
<map keyClass="java.lang.String"
valueClass="java.lang.String">
-
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</value></entry>
+
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
<entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSNativeServletAspectManager</value></entry>
</map>
</property>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:03:39 UTC (rev 8452)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:21:41 UTC (rev 8453)
@@ -24,6 +24,7 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
+
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -287,7 +288,6 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
-
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -328,7 +328,6 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
-
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -369,7 +368,6 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
-
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -410,7 +408,6 @@
<properties>
<jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
-
<endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
@@ -479,7 +476,6 @@
<properties>
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
-
<endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->