You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/31 09:51:19 UTC
svn commit: r1238273 - in /openejb/trunk/openejb/tomee:
apache-tomee/src/main/groovy/commands/
tomee-catalina/src/main/java/org/apache/tomee/catalina/
tomee-loader/src/main/java/org/apache/tomee/loader/
tomee-webapp/src/main/webapp/
Author: rmannibucau
Date: Tue Jan 31 08:51:18 2012
New Revision: 1238273
URL: http://svn.apache.org/viewvc?rev=1238273&view=rev
Log:
TOMEE-134 renaming openejb in tomee for TomEE
Modified:
openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/README.txt
Modified: openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy Tue Jan 31 08:51:18 2012
@@ -110,15 +110,15 @@ class SetupCommand {
log.info("extracting ${catalinaHome}")
ant.unzip(src: dest, dest: "${workDir}")
- log.info("Deploying the openejb war")
+ log.info("Deploying the tomee war")
ant.unzip(src: "${localRepo}/org/apache/openejb/${webapp}/${openejbVersion}/${webapp}-${openejbVersion}.war",
- dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/openejb")
+ dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
log.info("Installing to: ${catalinaHome}")
System.setProperty("catalina.home", "${catalinaHome}")
System.setProperty("catalina.base", "${catalinaHome}")
- Paths paths = new Paths(new File("${catalinaHome}/webapps/openejb"))
+ Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee"))
Installer installer = new Installer(paths, true)
installer.installAll()
@@ -126,8 +126,8 @@ class SetupCommand {
ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: "u+x", includes: "**/*.sh")
ant.delete(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples")
- ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/openejb/META-INF/LICENSE")
- ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/openejb/META-INF/NOTICE")
+ ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/LICENSE")
+ ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/NOTICE")
}
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Tue Jan 31 08:51:18 2012
@@ -66,7 +66,7 @@ import java.util.Set;
* <ul>
* <li/>openejb.home -> catalina.home
* <li/>openejb.base -> catalina.base
- * <li/>openejb.war -> $openejb.war
+ * <li/>tomee.war -> $tomee.war
* <li/>tomcat.version if not set
* <li/>tomcat.built if not set
* </ul>
@@ -136,7 +136,7 @@ public class TomcatLoader implements Loa
OptionsLog.install();
// install conf/openejb.xml and conf/logging.properties files
- String openejbWarDir = properties.getProperty("openejb.war");
+ String openejbWarDir = properties.getProperty("tomee.war");
if (openejbWarDir != null) {
Paths paths = new Paths(new File(openejbWarDir));
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java Tue Jan 31 08:51:18 2012
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServlet;
* The sole purpose of this class is to call the {@link TomcatEmbedder#embed} method
*
* This class gets the location of this webapp and assumes that it is
- * the openejb.war file then calls the embedder.
+ * the tomee.war file then calls the embedder.
*
* This method of bootstrapping is mutually exclussive to the {@link OpenEJBListener} approach
*/
@@ -54,8 +54,8 @@ public class LoaderServlet extends HttpS
//Web application directory
File webappDir = new File(getWebappPath(config));
- //Sets openejb.war property
- properties.setProperty("openejb.war", webappDir.getAbsolutePath());
+ //Sets tomee.war property
+ properties.setProperty("tomee.war", webappDir.getAbsolutePath());
//Sets source of the embedder
properties.setProperty("openejb.embedder.source", getClass().getSimpleName());
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java Tue Jan 31 08:51:18 2012
@@ -36,7 +36,7 @@ import org.apache.catalina.core.Standard
* This approach is mutually exclussive to the {@link LoaderServlet}
*
* This class does nothing more than scrape around in
- * Tomcat and look for the openejb.war so it can call the embedder
+ * Tomcat and look for the tomee.war so it can call the embedder
*
* This class can be installed in the Tomcat server.xml as an alternate
* way to bootstrap OpenEJB into Tomcat. The benefit of this is that
@@ -57,7 +57,7 @@ public class OpenEJBListener implements
Properties properties = new Properties();
File webappDir = findOpenEjbWar();
if (webappDir != null) {
- properties.setProperty("openejb.war", webappDir.getAbsolutePath());
+ properties.setProperty("tomee.war", webappDir.getAbsolutePath());
properties.setProperty("openejb.embedder.source", getClass().getSimpleName());
TomcatEmbedder.embed(properties, StandardServer.class.getClassLoader());
listenerInstalled = true;
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java Tue Jan 31 08:51:18 2012
@@ -35,7 +35,7 @@ public class TomEEJarScanner extends Sta
super.scan(context, classLoader, callback, jarsToIgnore);
}
-// String openejbWar = System.getProperty("openejb.war");
+// String openejbWar = System.getProperty("tomee.war");
//
// if (openejbWar == null) {
// EmbeddedJarScanner embeddedJarScanner = new EmbeddedJarScanner();
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java Tue Jan 31 08:51:18 2012
@@ -27,9 +27,9 @@ import java.util.Properties;
/**
* Ultimately this class does nothing lasting and just calls {@link TomcatHook#hook}
*
- * This class needs to know the path to the openejb.war file.
+ * This class needs to know the path to the tomee.war file.
*
- * With that information this class finds the openejb-loader jar in the openejb.war
+ * With that information this class finds the openejb-loader jar in the tomee.war
* essentially creates a "mini-webapp" which is to say it creates a new WebappClassloader
* that contains the openejb-loader jar and then uses that classloader to reflectively
* call the {@link TomcatHook#hook} method which does all the work to load OpenEJB into Tomcat
@@ -45,7 +45,7 @@ public class TomcatEmbedder {
private static final String OPENEJB_LOADER_PREFIX = "openejb-loader";
/**OpenEJB War name*/
- private static final String OPENEJB_WAR_NAME = "openejb.war";
+ private static final String TOMEE_WAR_NAME = "tomee.war";
/**
* Starts to embed process.
@@ -56,13 +56,13 @@ public class TomcatEmbedder {
if (catalinaCl == null) throw new NullPointerException("catalinaCl is null");
if (properties == null) throw new NullPointerException("properties is null");
- if (!properties.containsKey(OPENEJB_WAR_NAME)) {
- throw new IllegalArgumentException("properties must contain the openejb.war property");
+ if (!properties.containsKey(TOMEE_WAR_NAME)) {
+ throw new IllegalArgumentException("properties must contain the tomee.war property");
}
// openejbWar represents the absolute path of the openejb webapp i.e. the openejb directory
- File openejbWar = new File(properties.getProperty(OPENEJB_WAR_NAME));
+ File openejbWar = new File(properties.getProperty(TOMEE_WAR_NAME));
if (!openejbWar.isDirectory()) {
- throw new IllegalArgumentException("openejb.war is not a directory: " + openejbWar);
+ throw new IllegalArgumentException("tomee.war is not a directory: " + openejbWar);
}
// retrieve the current ClassLoader
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
@@ -108,7 +108,7 @@ public class TomcatEmbedder {
/**
* Return path to jar file that contains this class.
* <p>
- * Normally, openejb.war/lib/tomee-loader.jar
+ * Normally, tomee.war/lib/tomee-loader.jar
* </p>
* @return path to jar file that contains this class
*/
@@ -158,13 +158,13 @@ public class TomcatEmbedder {
/**
* Gets path to jar file that has namePrefix
- * and in the openejb.war/lib location.
- * @param openejbWar path to openejb.war
+ * and in the tomee.war/lib location.
+ * @param tomeeWar path to tomee.war
* @param namePrefix prefix of the jar file
* @return path to file
*/
- private static File findOpenEJBJar(File openejbWar, String namePrefix) {
- File openEJBLibDir = new File(openejbWar, "lib");
+ private static File findOpenEJBJar(File tomeeWar, String namePrefix) {
+ File openEJBLibDir = new File(tomeeWar, "lib");
if (openEJBLibDir == null) return null;
File openejbLoaderJar = null;
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java Tue Jan 31 08:51:18 2012
@@ -159,7 +159,7 @@ public class TomcatHelper {
}
/**
- * Get a comma separated list of all jars under $CATALINA_BASE/webapps/openejb/lib
+ * Get a comma separated list of all jars under $CATALINA_BASE/webapps/tomee/lib
* The idea is that all of these jars should be excluded from Tomcat's scanning for web fragments
* because these jar don't have any fragments in, and the scanning process is expensive in terms
* of PermGen space.
@@ -167,7 +167,7 @@ public class TomcatHelper {
* @return list of jars as string, comma separated
*/
private static String getJarsToSkip() {
- File openejbApp = new File(System.getProperty("openejb.war"));
+ File openejbApp = new File(System.getProperty("tomee.war"));
File libFolder = new File(openejbApp, "lib");
StringBuilder builder = new StringBuilder();
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java Tue Jan 31 08:51:18 2012
@@ -39,21 +39,21 @@ import static org.apache.openejb.loader.
* This class should only be loadded and used via reflection from TomcatEmbedder.
*
* Everything that happens up to the point of calling this particular method
- * (except setting openejb.war) ultimately means nothing and does not matter
+ * (except setting tomee.war) ultimately means nothing and does not matter
* to the integration.
*
- * Requires openejb.war to be set, the sets the following properties:
+ * Requires tomee.war to be set, the sets the following properties:
*
* System properties:
* set openejb.home -> catalina.home
* set openejb.base -> catalina.base
- * set openejb.war -> $openejb.war
+ * set tomee.war -> $tomee.war
* set tomcat.version if not set
* set tomcat.built if not set
*
* Local properties:
* set openejb.loader -> tomcat-system
- * set openejb.libs -> $openejb.war/lib
+ * set openejb.libs -> $tomee.war/lib
*
* With these properties setup, this class with construct an {@link Embedder}
* using the "org.apache.tomee.catalina.TomcatLoader" as the loader.
@@ -73,7 +73,7 @@ class TomcatHook {
public static final String TEMP_DIR = "temp";
/**
- * Using openejb.war path, it sets several required
+ * Using tomee.war path, it sets several required
* system properties and init {@link SystemInstance#init(Properties)}
*
* <p>
@@ -85,20 +85,20 @@ class TomcatHook {
*/
static void hook(Properties properties) {
- // verify properties and make sure it contains the openejb.war property
+ // verify properties and make sure it contains the tomee.war property
if (properties == null) throw new NullPointerException("properties is null");
- //Check openejb.war property
+ //Check tomee.war property
//This property is set by the LoaderServlet or OpenEJBListener
- //When you deploy openejb.war into webapps/ directory of the tomcat
+ //When you deploy tomee.war into webapps/ directory of the tomcat
//Loader servlet automatically starts and initialize this property
- if (!properties.containsKey("openejb.war")) throw new IllegalArgumentException("properties must contain the openejb.war property");
+ if (!properties.containsKey("tomee.war")) throw new IllegalArgumentException("properties must contain the tomee.war property");
- //Get the openejb directory (under webapps) using the openejb.war property
- File openejbWar = new File(properties.getProperty("openejb.war"));
+ //Get the openejb directory (under webapps) using the tomee.war property
+ File openejbWar = new File(properties.getProperty("tomee.war"));
if (!openejbWar.isDirectory()) {
- throw new IllegalArgumentException("openejb.war is not a directory: " + openejbWar);
+ throw new IllegalArgumentException("tomee.war is not a directory: " + openejbWar);
}
// if SystemInstance is already initialized, then return
@@ -123,14 +123,14 @@ class TomcatHook {
//Sets system property for openejb.base
System.setProperty("openejb.base", catalinaBase);
- // Set the openejb.war property as a *System* property
- System.setProperty("openejb.war", openejbWar.getAbsolutePath());
+ // Set the tomee.war property as a *System* property
+ System.setProperty("tomee.war", openejbWar.getAbsolutePath());
// set the property openejb.libs to contain the absolute path of the lib directory of openejb webapp
File libDir = new File(openejbWar, "lib");
String libPath = libDir.getAbsolutePath();
- //Sets openejb.libs to openejb.war/lib folder
+ //Sets openejb.libs to tomee.war/lib folder
properties.setProperty("openejb.libs", libPath);
// System.setProperty("tomcat.version", "x.y.z.w");
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/README.txt
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/README.txt?rev=1238273&r1=1238272&r2=1238273&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/README.txt (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/README.txt Tue Jan 31 08:51:18 2012
@@ -17,8 +17,8 @@ Installation
Assuming you have a normal working Tomcat 5.5 or 6.x installation:
- 1. Copy openejb.war to ${catalina.base}/webapps/openejb.war
- (Note: the file must be named openejb.war)
+ 1. Copy tomee.war to ${catalina.base}/webapps/tomee.war
+ (Note: the file must be named tomee.war)
2. Start Tomcat if it is not already running
3. (optional) Visit http://localhost:8080/openejb/installer and click the 'install' button