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 2011/10/09 10:55:16 UTC
svn commit: r1180569 - in /openejb/trunk/openejb:
assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/
assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/lo...
Author: rmannibucau
Date: Sun Oct 9 08:55:15 2011
New Revision: 1180569
URL: http://svn.apache.org/viewvc?rev=1180569&view=rev
Log:
TOMEE-27 using a more generic test to detect webapp and fixing some missing tomee renaming
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java
openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/assembly/war.xml
openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/assembly/war.xml
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
Modified: openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Sun Oct 9 08:55:15 2011
@@ -67,7 +67,7 @@ import java.util.Properties;
* <h1>Integration Actions</h1>
* <p/>
* <ul>
- * <li/>Setup ServiceJar: set openejb.provider.default -> org.apache.openejb.tomcat
+ * <li/>Setup ServiceJar: set openejb.provider.default -> org.apache.tomee
* We therefore will load this file: META-INF/org.apache.openejb.tomcat/service-jar.xml
* <li/>Init SystemInstance and OptionsLog
* <li/>
Modified: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Sun Oct 9 08:55:15 2011
@@ -234,7 +234,7 @@ public class Installer {
}
// does the server.xml contain our listener name... it is possible that they commented out our listener, but that would be a PITA to detect
- if (serverXmlOriginal.contains("org.apache.openejb.tomcat.loader.OpenEJBListener")) {
+ if (serverXmlOriginal.contains("org.apache.tomee.loader.OpenEJBListener")) {
alerts.addWarning("OpenEJB Listener already declared in Tomcat server.xml file.");
return;
}
@@ -253,7 +253,7 @@ public class Installer {
">",
">\r\n" +
" <!-- OpenEJB plugin for Tomcat -->\r\n" +
- " <Listener className=\"org.apache.openejb.tomcat.loader.OpenEJBListener\" />");
+ " <Listener className=\"org.apache.tomee.loader.OpenEJBListener\" />");
} catch (IOException e) {
alerts.addError("Error while adding listener to server.xml file", e);
}
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=1180569&r1=1180568&r2=1180569&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 08:55:15 2011
@@ -44,7 +44,7 @@ import java.util.Properties;
* set openejb.libs -> $openejb.war/lib
*
* With these properties setup, this class with construct an {@link Embedder}
- * using the "org.apache.openejb.tomcat.catalina.TomcatLoader" as the loader.
+ * using the "org.apache.tomee.catalina.TomcatLoader" as the loader.
*
* The Embedder will use the openejb.libs property to find all the jars to be loaded
* then it will use the openejb.loader property to find out *how* to add them into
@@ -52,7 +52,7 @@ import java.util.Properties;
* class loader, it loads the {@link org.apache.openejb.loader.Loader} implementation
* and calls it's {@link org.apache.openejb.loader.Loader#init} method.
*
- * See org.apache.openejb.tomcat.catalina.TomcatLoader for the next part of the story
+ * See org.apache.tomee.catalina.TomcatLoader for the next part of the story
*/
class TomcatHook {
@@ -159,7 +159,7 @@ class TomcatHook {
// This guy does the magic of squishing the openejb libraries into the parent classloader
// and kicking off the reall integration.
- Embedder embedder = new Embedder("org.apache.openejb.tomcat.catalina.TomcatLoader");
+ Embedder embedder = new Embedder("org.apache.tomee.catalina.TomcatLoader");
embedder.init(properties);
} catch (Exception e) {
e.printStackTrace();
Modified: openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/assembly/war.xml?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/assembly/war.xml Sun Oct 9 08:55:15 2011
@@ -89,7 +89,7 @@
<outputDirectory>WEB-INF/lib</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.openejb:openejb-tomcat-loader</include>
+ <include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/assembly/war.xml?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/assembly/war.xml Sun Oct 9 08:55:15 2011
@@ -99,7 +99,7 @@
<outputDirectory>WEB-INF/lib</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.openejb:openejb-tomcat-loader</include>
+ <include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sun Oct 9 08:55:15 2011
@@ -1436,13 +1436,9 @@ public class DeploymentLoader implements
return ConnectorModule.class;
}
- // Tomcat's context.xml, possibly no web.xml as it's optional since Servlet 3.0
- if (descriptors.containsKey("context.xml")) {
- return WebModule.class;
- }
-
Map<String, URL> webDescriptors = getWebDescriptors(getFile(baseUrl));
- if (webDescriptors.containsKey("web.xml") || path.endsWith(".war")) {
+ if (webDescriptors.containsKey("web.xml") || webDescriptors.containsKey("web-fragment.xml") // descriptor
+ || path.endsWith(".war") || new File(path, "WEB-INF").exists()) { // webapp specific files
return WebModule.class;
}
Modified: openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/pom.xml?rev=1180569&r1=1180568&r2=1180569&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/rest-example/pom.xml Sun Oct 9 08:55:15 2011
@@ -83,7 +83,7 @@
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-tomcat-plus-webapp</artifactId>
+ <artifactId>tomee-plus-webapp</artifactId>
<version>${openejb.version}</version>
<contextPath>openejb</contextPath>
</webappArtifact>