svn commit: r562229 - in /openejb/trunk/openejb3/assembly/openejb-tomcat: maven.xml src/main/java/org/apache/openejb/tomcat/TomcatLoader.java

[da...@apache.org]

Author: dain
Date: Thu Aug  2 12:42:32 2007
New Revision: 562229

URL: http://svn.apache.org/viewvc?view=rev&rev=562229
Log:
Applications are now stored in a directory named apps

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml?view=diff&rev=562229&r1=562228&r2=562229
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml Thu Aug  2 12:42:32 2007
@@ -191,18 +191,18 @@
     <goal name="setup:itests">
       <j:set var="targetDir" value="${basedir}/target/"/>
       <j:set var="itests.jar" value="openejb-tomcat-${openejb.version}-test.jar"/>
-      <mkdir dir="${tomcat.home}/beans"/>
+      <mkdir dir="${tomcat.home}/apps"/>
 
-      <u:file var="fileAsFile" name="${tomcat.home}/beans/${itests.jar}"/>
+      <u:file var="fileAsFile" name="${tomcat.home}/apps/${itests.jar}"/>
       <j:if test="${!(fileAsFile.exists())}">
-        <copy file="${targetDir}/${itests.jar}" todir="${tomcat.home}/beans" />
+        <copy file="${targetDir}/${itests.jar}" todir="${tomcat.home}/apps" />
       </j:if>
     </goal>
 
     <goal name="setup:itests-war">
       <j:set var="targetDir" value="${basedir}/target/"/>
       <j:set var="itests.war" value="openejb-tomcat-${openejb.version}-itests.war"/>
-      <mkdir dir="${tomcat.home}/beans"/>
+      <mkdir dir="${tomcat.home}/apps"/>
 
       <u:file var="fileAsFile" name="${tomcat.home}/webapps/itests.war"/>
       <j:if test="${!(fileAsFile.exists())}">

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java?view=diff&rev=562229&r1=562228&r2=562229
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java Thu Aug  2 12:42:32 2007
@@ -58,7 +58,7 @@
 
         // DMB: This is ugly here, all this code could use some cleaning
         if ("tomcat-system".equals(props.getProperty("openejb.loader"))){
-            SystemInstance.get().getBase().getDirectory("beans", true);
+            SystemInstance.get().getBase().getDirectory("apps", true);
         }
         ejbServer = new EjbServer();
         SystemInstance.get().setComponent(EjbServer.class, ejbServer);