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/12/04 22:46:18 UTC
svn commit: r1417206 - in /openejb/trunk/openejb/tomee:
tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
tomee-webapp/pom.xml tomee-webapp/src/main/assembly/war.xml
Author: rmannibucau
Date: Tue Dec 4 21:46:17 2012
New Revision: 1417206
URL: http://svn.apache.org/viewvc?rev=1417206&view=rev
Log:
separation between tomee-webapp jar and war, adding some commented system props and initializing an empty tomee.xml (initial goal == remove <Deployment />)
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/assembly/war.xml
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1417206&r1=1417205&r2=1417206&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Tue Dec 4 21:46:17 2012
@@ -174,11 +174,21 @@ public class Installer {
addTomEELinkToTomcatHome();
+ commentDeploymentDir();
+
if (!alerts.hasErrors()) {
status = Status.REBOOT_REQUIRED;
}
}
+ private void commentDeploymentDir() {
+ Installers.writeAll(new File(paths.getCatalinaConfDir(), "tomee.xml"),
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<tomee>\n" +
+ " <!-- see http://tomee.apache.org/containers-and-resources.html -->\n" +
+ "</tomee\n", alerts);
+ }
+
private void addTomEELinkToTomcatHome() {
final File home = paths.getHome();
final String indeJsp = Installers.readAll(home, alerts);
@@ -615,6 +625,7 @@ public class Installer {
systemPropertiesWriter.write("# tomee.jaxws.oldsubcontext = false\n");
systemPropertiesWriter.write("\n");
+ systemPropertiesWriter.write("# openejb.system.apps = true\n");
systemPropertiesWriter.write("# openejb.servicemanager.enabled = true\n");
systemPropertiesWriter.write("# openejb.jmx.active = false\n");
systemPropertiesWriter.write("# openejb.descriptors.output = false\n");
@@ -645,6 +656,8 @@ public class Installer {
systemPropertiesWriter.write("# openejb.jsessionid-support = \n");
systemPropertiesWriter.write("# openejb.myfaces.disable-default-values = true\n");
systemPropertiesWriter.write("# openejb.web.xml.major = \n");
+ systemPropertiesWriter.write("# openjpa.Log = \n");
+ systemPropertiesWriter.write("# openejb.jdbc.log = false\n");
systemPropertiesWriter.write("# javax.persistence.provider = org.apache.openjpa.persistence.PersistenceProviderImpl\n");
systemPropertiesWriter.write("# javax.persistence.transactionType = \n");
systemPropertiesWriter.write("# javax.persistence.jtaDataSource = \n");
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1417206&r1=1417205&r2=1417206&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Tue Dec 4 21:46:17 2012
@@ -31,9 +31,20 @@
<name>OpenEJB :: TomEE :: Webapp</name>
<build>
<plugins>
+ <plugin> <!-- the jar is only for resources and other classes are for the gui -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <includes>
+ <include>META-INF/**/*</include>
+ <include>juli.properties</include>
+ </includes>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
+ <version>2.2.2</version>
<executions>
<execution>
<id>war</id>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/assembly/war.xml?rev=1417206&r1=1417205&r2=1417206&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/assembly/war.xml Tue Dec 4 21:46:17 2012
@@ -40,13 +40,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>${basedir}/src/main/webapp</directory>
+ <directory>${project.basedir}/src/main/webapp</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/target/classes</directory>
+ <directory>${project.basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
<excludes>
+ <exclude>META-INF/org.apache.tomee/**</exclude>
<exclude>org/**</exclude>
<exclude>**/LICENSE</exclude>
<exclude>**/NOTICE</exclude>
@@ -58,6 +59,7 @@
<directory>${basedir}/target/classes</directory>
<outputDirectory>WEB-INF/classes</outputDirectory>
<excludes>
+ <exclude>**/META-INF/org.apache.tomee/service-jar.xml</exclude>
<exclude>**/LICENSE</exclude>
<exclude>**/NOTICE</exclude>
<exclude>**/LICENSE.txt</exclude>