svn commit: r1572962 - in /tomee/tomee/trunk/container: openejb-core/ openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/ openejb-core/src/test/java/org/apache/openejb/ openejb-loader/src/main/java/org/apache/openejb/loader/

[an...@apache.org]

Author: andygumbrecht
Date: Fri Feb 28 14:39:15 2014
New Revision: 1572962

URL: http://svn.apache.org/r1572962
Log:
derby.system.home

Modified:
    tomee/tomee/trunk/container/openejb-core/pom.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/DerbyDataSourcePlugin.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
    tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java

Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1572962&r1=1572961&r2=1572962&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Fri Feb 28 14:39:15 2014
@@ -294,11 +294,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <compilerArguments>
-            <endorseddirs>${openejb.build.endorsed}</endorseddirs>
-          </compilerArguments>
+          <compilerArgs>
+            <arg>-Djava.endorsed.dirs=${openejb.build.endorsed}</arg>
+            <arg>-Xlint:path</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/DerbyDataSourcePlugin.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/DerbyDataSourcePlugin.java?rev=1572962&r1=1572961&r2=1572962&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/DerbyDataSourcePlugin.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/plugin/DerbyDataSourcePlugin.java Fri Feb 28 14:39:15 2014
@@ -21,7 +21,9 @@ import org.apache.openejb.loader.SystemI
 public class DerbyDataSourcePlugin implements DataSourcePlugin {
     @Override
     public String updatedUrl(final String dataSourceUrl) {
-        System.setProperty("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath());
+
+        System.setProperty("derby.system.home"
+                , SystemInstance.get().getProperty("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath()));
         return dataSourceUrl;
     }
 

Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/iTest.java?rev=1572962&r1=1572961&r2=1572962&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/iTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/iTest.java Fri Feb 28 14:39:15 2014
@@ -57,7 +57,7 @@ public class iTest extends org.apache.op
         // m2 executes tests in a module home directory (e.g. container/openejb-persistence)
         // Derby creates derby.log file in derby.system.home
         // @see http://publib.boulder.ibm.com/infocenter/cscv/v10r1/index.jsp?topic=/com.ibm.cloudscape.doc/cdevdvlp25889.html
-        System.setProperty("derby.system.home", "target");
+        System.setProperty("derby.system.home", System.getProperty("derby.system.home", "target"));
 
         // Copied from org.apache.openejb.SomeoneBrokeSurefireAndThisIsADirtyHackForItTest that's now gone
         System.setProperty("openejb.assembler", org.apache.openejb.assembler.classic.Assembler.class.getName());

Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java?rev=1572962&r1=1572961&r2=1572962&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java (original)
+++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java Fri Feb 28 14:39:15 2014
@@ -99,7 +99,7 @@ public class SystemInstance {
 
         this.internalProperties.setProperty("openejb.home", home.getDirectory().getCanonicalPath());
         this.internalProperties.setProperty("openejb.base", base.getDirectory().getCanonicalPath());
-        System.setProperty("derby.system.home", base.getDirectory().getCanonicalPath());
+        System.setProperty("derby.system.home", System.getProperty("derby.system.home", base.getDirectory().getCanonicalPath()));
 
 
     }