[jbossws-commits] JBossWS SVN: r10550 - in container/jboss50/branches: jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Aug 17 07:13:28 EDT 2009


Author: richard.opalka at jboss.com
Date: 2009-08-17 07:13:28 -0400 (Mon, 17 Aug 2009)
New Revision: 10550

Modified:
   container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
   container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
   container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
   container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
Log:
[JBWS-2630] fixing issue

Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
          jbossWebMD.setSecurityDomain(securityDomain);
       }
 
-      // Set context root
-      final String contextRoot = dep.getService().getContextRoot();
-      this.log.debug("Setting context root: " + contextRoot);
-      jbossWebMD.setContextRoot(contextRoot);
-
       // Set virtual hosts
       final List<String> virtualHosts = dep.getService().getVirtualHosts();
       this.log.debug("Setting virtual hosts: " + virtualHosts);

Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
 
       this.propagateContextProps(dep, jbossWebMD);
       this.configureEndpoints(dep, jbossWebMD);
+      this.modifyContextRoot(dep, jbossWebMD);
    }
 
    /**
@@ -128,6 +129,19 @@
    }
 
    /**
+    * Modifies context root. 
+    *
+    * @param dep webservice deployment
+    * @param jbossWebMD web meta data
+    */
+   private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+   {
+      final String contextRoot = dep.getService().getContextRoot();
+      this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+      jbossWebMD.setContextRoot(contextRoot);
+   }
+
+   /**
     * Returns stack specific transport class name.
     *
     * @param dep webservice deployment

Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
          jbossWebMD.setSecurityDomain(securityDomain);
       }
 
-      // Set context root
-      final String contextRoot = dep.getService().getContextRoot();
-      this.log.debug("Setting context root: " + contextRoot);
-      jbossWebMD.setContextRoot(contextRoot);
-
       // Set virtual hosts
       final List<String> virtualHosts = dep.getService().getVirtualHosts();
       this.log.debug("Setting virtual hosts: " + virtualHosts);

Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
 
       this.propagateContextProps(dep, jbossWebMD);
       this.configureEndpoints(dep, jbossWebMD);
+      this.modifyContextRoot(dep, jbossWebMD);
    }
 
    /**
@@ -128,6 +129,19 @@
    }
 
    /**
+    * Modifies context root. 
+    *
+    * @param dep webservice deployment
+    * @param jbossWebMD web meta data
+    */
+   private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+   {
+      final String contextRoot = dep.getService().getContextRoot();
+      this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+      jbossWebMD.setContextRoot(contextRoot);
+   }
+
+   /**
     * Returns stack specific transport class name.
     *
     * @param dep webservice deployment

Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
          jbossWebMD.setSecurityDomain(securityDomain);
       }
 
-      // Set context root
-      final String contextRoot = dep.getService().getContextRoot();
-      this.log.debug("Setting context root: " + contextRoot);
-      jbossWebMD.setContextRoot(contextRoot);
-
       // Set virtual hosts
       final List<String> virtualHosts = dep.getService().getVirtualHosts();
       this.log.debug("Setting virtual hosts: " + virtualHosts);

Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
 
       this.propagateContextProps(dep, jbossWebMD);
       this.configureEndpoints(dep, jbossWebMD);
+      this.modifyContextRoot(dep, jbossWebMD);
    }
 
    /**
@@ -128,6 +129,19 @@
    }
 
    /**
+    * Modifies context root. 
+    *
+    * @param dep webservice deployment
+    * @param jbossWebMD web meta data
+    */
+   private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+   {
+      final String contextRoot = dep.getService().getContextRoot();
+      this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+      jbossWebMD.setContextRoot(contextRoot);
+   }
+
+   /**
     * Returns stack specific transport class name.
     *
     * @param dep webservice deployment



More information about the jbossws-commits mailing list