Author: dblevins Date: Thu May 27 20:53:47 2010 New Revision: 948985 URL: http://svn.apache.org/viewvc?rev=948985&view=rev Log: svn merge -r 946813:946814 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=946814&view=rev ------------------------------------------------------------------------ r946814 | jgallimore | 2010-05-20 16:09:10 -0700 (Thu, 20 May 2010) | 1 line OPENEJB-1283 adding openejb-tomcat-bundle module to create tomcat/openejb all-in-one zip ------------------------------------------------------------------------ Added: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/openejb-tomcat-bundle.iml - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/openejb-tomcat-bundle.iml openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/openejb-tomcat-bunlde.iml - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/openejb-tomcat-bunlde.iml openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/assembly/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/assembly/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/assembly/bundle.xml - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/assembly/bundle.xml openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/tomcat/ - copied from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/tomcat/ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/tomcat/TomcatBundleInstaller.java - copied unchanged from r946814, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/main/java/org/apache/openejb/tomcat/TomcatBundleInstaller.java Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/pom.xml openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:53:47 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814 Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java?rev=948985&r1=948984&r2=948985&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java (original) +++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java Thu May 27 20:53:47 2010 @@ -37,6 +37,8 @@ public class Installer { private static final boolean listenerInstalled; private static final boolean agentInstalled; + private boolean force = false; + static { // is the OpenEJB listener installed listenerInstalled = "OpenEJBListener".equals(SystemInstance.get().getProperty("openejb.embedder.source")); @@ -64,6 +66,12 @@ public class Installer { } } + public Installer(Paths paths, boolean force) { + this (paths); + this.force = force; + } + + public Alerts getAlerts() { return alerts; } @@ -89,7 +97,7 @@ public class Installer { } public void installListener() { - if (listenerInstalled) { + if (listenerInstalled && !force) { // addInfo("OpenEJB Listener already installed"); return; } @@ -156,7 +164,7 @@ public class Installer { } public void installJavaagent() { - if (agentInstalled) { + if (agentInstalled && !force) { // addInfo("OpenEJB Agent already installed"); return; } Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/pom.xml?rev=948985&r1=948984&r2=948985&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/pom.xml (original) +++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/pom.xml Thu May 27 20:53:47 2010 @@ -34,6 +34,7 @@ <module>openejb-tomcat-catalina</module> <module>openejb-tomcat-common</module> <module>openejb-tomcat-webapp</module> + <module>openejb-tomcat-bundle</module> </modules> </project> Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:53:47 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:53:47 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814
