[jbossws-commits] JBossWS SVN: r8452 - in stack/metro/trunk/modules: server/src/main/resources and 1 other directories.

Mon Oct 13 07:03:39 EDT 2008

Author: richard.opalka at jboss.com
Date: 2008-10-13 07:03:39 -0400 (Mon, 13 Oct 2008)
New Revision: 8452

Removed:
   stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java
Modified:
   stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
   stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml
   stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractES + AbstractAspectizedES to common

Deleted: 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	2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java	2008-10-13 11:03:39 UTC (rev 8452)
@@ -1,46 +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.metro;
-
-import org.jboss.wsf.framework.deployment.AbstractAspectizedEndpointServlet;
-import org.jboss.wsf.spi.management.EndpointResolver;
-
-/**
- * An aspectized Metro endpoint servlet that is installed for every web service endpoint on AS 5.x series
- * @author richard.opalka at jboss.com
- */
-public final class AspectizedEndpointServlet extends AbstractAspectizedEndpointServlet
-{
-
-   /**
-    * Provides Metro specific endpoint resolver
-    * @param servletContext servlet context
-    * @param servletName servlet name
-    * @return new Metro specific endpoint resolver
-    */
-   @Override
-   protected final EndpointResolver newEndpointResolver(String servletContext, String servletName)
-   {
-      return new WebAppResolver(servletContext, servletName);
-   }
-   
-}

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-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java	2008-10-13 11:03:39 UTC (rev 8452)
@@ -22,10 +22,10 @@
 package org.jboss.wsf.stack.metro;
 
 import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.framework.deployment.AbstractEndpointServlet;
+import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
 
 /**
- * A Metro endpoint servlet that is installed for every web service endpoint on AS 4.2.x series
+ * A Metro endpoint servlet that is installed for every web service endpoint
  * @author thomas.diesler at jboss.com
  * @author heiko.braun at jboss.com
  * @author richard.opalka at jboss.com

Modified: stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml	2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml	2008-10-13 11:03:39 UTC (rev 8452)
@@ -51,7 +51,7 @@
     <property name="provides">ContextProperties</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.metro.AspectizedEndpointServlet</value></entry>        
+        <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>        
         <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSMetroServletAspectManager</value></entry>        
       </map>
     </property>

Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml	2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/testsuite/pom.xml	2008-10-13 11:03:39 UTC (rev 8452)
@@ -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.metro.EndpointServlet</endpoint.servlet>
   </properties>
   
   <!-- Modules -->
@@ -293,7 +294,6 @@
       <properties>
         <jboss.version>4.2.2.GA</jboss.version>
         <jbossws.integration.target>jboss422</jbossws.integration.target>
-        <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
       </properties>
       <dependencies>
         <dependency>
@@ -339,7 +339,6 @@
       <properties>
         <jboss.version>4.2.3.GA</jboss.version>
         <jbossws.integration.target>jboss423</jbossws.integration.target>
-        <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
       </properties>
       <dependencies>
         <dependency>
@@ -385,7 +384,6 @@
       <properties>
         <jboss.version>4.2.4-SNAPSHOT</jboss.version>
         <jbossws.integration.target>jboss424</jbossws.integration.target>
-        <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
       </properties>
       <dependencies>
         <dependency>
@@ -431,7 +429,6 @@
       <properties>
         <jboss.version>5.0.0.CR2</jboss.version>
         <jbossws.integration.target>jboss500</jbossws.integration.target>
-        <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet>
       </properties>
       <dependencies>
         <!-- JBWS-2263 -->
@@ -495,7 +492,6 @@
       <properties>
         <jboss.version>5.0.0-SNAPSHOT</jboss.version>
         <jbossws.integration.target>jboss501</jbossws.integration.target>
-        <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet>
       </properties>
       <dependencies>
         <!-- JBWS-2263 -->


