svn commit: r1180576 - in /openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader: TomcatEmbedder.java TomcatHook.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Oct  9 10:19:02 2011
New Revision: 1180576

URL: http://svn.apache.org/viewvc?rev=1180576&view=rev
Log:
some tomee renaming in comments

Modified:
    openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java
    openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java

Modified: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java?rev=1180576&r1=1180575&r2=1180576&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java Sun Oct  9 10:19:02 2011
@@ -73,8 +73,8 @@ public class TomcatEmbedder {
             Class<?> webappClClass = catalinaCl.loadClass("org.apache.catalina.loader.WebappClassLoader");
             ClassLoader childCl = (ClassLoader) webappClClass.getConstructor(ClassLoader.class).newInstance(catalinaCl);
 
-            // childCl.addRepository(openejb-tomcat-loader.jar)
-            // Use reflection to add the openejb-tomcat-loader.jar file to the repository of WebappClassLoader. 
+            // childCl.addRepository(tomee-loader.jar)
+            // Use reflection to add the tomee-loader.jar file to the repository of WebappClassLoader. 
             // WebappClassLoader will now search for classes in this jar too
             File thisJar = getThisJar();
             String thisJarUrl = thisJar.toURI().toString();
@@ -93,7 +93,7 @@ public class TomcatEmbedder {
             webappClClass.getMethod("start").invoke(childCl);
 
             // TomcatHook.hook()
-            //This is loaded by childCl and is defined in the openejb-tomcat-loader
+            //This is loaded by childCl and is defined in the tomee-loader
             Class<?> tomcatUtilClass = childCl.loadClass("org.apache.tomee.loader.TomcatHook");
             Method hookMethod = tomcatUtilClass.getDeclaredMethod("hook", Properties.class);
             hookMethod.setAccessible(true);
@@ -108,7 +108,7 @@ public class TomcatEmbedder {
     /**
      * Return path to jar file that contains this class.
      * <p>
-     * Normally, openejb.war/lib/openejb-tomcat-loader.jar
+     * Normally, openejb.war/lib/tomee-loader.jar
      * </p>
      * @return path to jar file that contains this class
      */

Modified: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java?rev=1180576&r1=1180575&r2=1180576&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java Sun Oct  9 10:19:02 2011
@@ -62,7 +62,7 @@ class TomcatHook {
      * 
      * <p>
      * This method is called from {@link TomcatEmbedder#embed(Properties, ClassLoader)}
-     * method from classloader that contains openejb-loader and openejb-tomcat-loader 
+     * method from classloader that contains openejb-loader and tomee-loader 
      * with CatalinaClassLoader as the parent.
      * </p>
      * @param properties properties file
@@ -165,4 +165,4 @@ class TomcatHook {
             e.printStackTrace();
         }
     }
-}
\ No newline at end of file
+}