Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original) +++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Sun Jan 22 19:47:26 2012 @@ -119,7 +119,10 @@ public class Container { // Need to use JULI so log messages from the tests are visible System.setProperty("java.util.logging.manager", "org.apache.juli.ClassLoaderLogManager"); - System.setProperty("java.util.logging.config.file", new File(conf, "logging.properties").toString()); + final File logging = new File(conf, "logging.properties"); + if (logging.exists()) { + System.setProperty("java.util.logging.config.file", logging.getAbsolutePath()); + } System.setProperty("catalina.base", base.getAbsolutePath()); // Trigger loading of catalina.properties @@ -137,7 +140,6 @@ public class Container { System.out.println("Starting TomEE from: " + base.getAbsolutePath()); String catalinaBase = base.getAbsolutePath(); - System.setProperty("openejb.logging.embedded", "true"); System.setProperty("openejb.deployments.classpath", "false"); System.setProperty("catalina.home", catalinaBase); System.setProperty("catalina.base", catalinaBase); @@ -304,9 +306,9 @@ public class Container { private void copyFileTo(File targetDir, String filename) throws IOException { InputStream is = getClass().getResourceAsStream("/org/apache/tomee/configs/" + filename); - FileOutputStream os = new FileOutputStream(new File(targetDir, filename)); - - copyStream(is, os); + if (is != null) { // should be null since we are using default conf + copyStream(is, new FileOutputStream(new File(targetDir, filename))); + } } private void copyStream(InputStream is, FileOutputStream os) throws IOException {
Modified: openejb/trunk/openejb/tomee/tomee-loader/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/pom.xml?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/tomee/tomee-loader/pom.xml (original) +++ openejb/trunk/openejb/tomee/tomee-loader/pom.xml Sun Jan 22 19:47:26 2012 @@ -33,7 +33,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-loader</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml (original) +++ openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml Sun Jan 22 19:47:26 2012 @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-cxf-rs</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -67,7 +67,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-cxf-transport</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -79,7 +79,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-cxf</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-rest</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -103,7 +103,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-webservices</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <exclusions> <exclusion> <groupId>org.apache.openejb</groupId> Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original) +++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Sun Jan 22 19:47:26 2012 @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -103,7 +103,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -115,7 +115,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-hsql</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -127,7 +127,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-http</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -139,7 +139,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-jsf</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -151,7 +151,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-server</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -163,7 +163,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>tomee-catalina</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -179,7 +179,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>tomee-common</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -195,7 +195,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>tomee-loader</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <scope>runtime</scope> <exclusions> <exclusion> Modified: openejb/trunk/openejb/tomee/tomee-webservices/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webservices/pom.xml?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/tomee/tomee-webservices/pom.xml (original) +++ openejb/trunk/openejb/tomee/tomee-webservices/pom.xml Sun Jan 22 19:47:26 2012 @@ -52,22 +52,22 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-webservices</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-rest</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-cxf-rs</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-cxf</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> <exclusions> <exclusion> <groupId>javax.xml.stream</groupId> @@ -93,17 +93,17 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-server</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-http</artifactId> - <version>${project.version}</version> + <version>${openejb.version}</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> Modified: openejb/trunk/openejb/utils/openejb-spring/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-spring/pom.xml?rev=1234582&r1=1234581&r2=1234582&view=diff ============================================================================== --- openejb/trunk/openejb/utils/openejb-spring/pom.xml (original) +++ openejb/trunk/openejb/utils/openejb-spring/pom.xml Sun Jan 22 19:47:26 2012 @@ -76,7 +76,6 @@ <workingDirectory>${basedir}/target</workingDirectory> <systemPropertyVariables> <openejb.home>${basedir}/target/test-classes</openejb.home> - <log4j.configuration>file:///${basedir}/target/classes/embedded.logging.properties</log4j.configuration> </systemPropertyVariables> <excludes> <exclude>**/TestHandler.java</exclude> @@ -129,10 +128,6 @@ <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> </dependencies> <profiles> @@ -153,10 +148,6 @@ <name>openejb.home</name> <value>${basedir}/target/test-classes</value> </property> - <property> - <name>log4j.configuration</name> - <value>file:///${basedir}/target/classes/embedded.logging.properties</value> - </property> </systemProperties> </configuration> </plugin>
