tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r611914 - in /openejb/trunk/openejb3: assembly/openejb-standalone/src/main/assembly/ assembly/openejb-standalone/src/main/resources/ assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/ contai...
Date Mon, 14 Jan 2008 20:16:51 GMT
Author: dain
Date: Mon Jan 14 12:16:44 2008
New Revision: 611914

URL: http://svn.apache.org/viewvc?rev=611914&view=rev
Log:
Add data directory to contain binary data files.
Moved hsql data files to data directory

Added:
    openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/DATA-README.txt
Modified:
    openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf

Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml?rev=611914&r1=611913&r2=611914&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml Mon Jan 14
12:16:44 2008
@@ -69,7 +69,20 @@
       <directory>target/classes/empty</directory>
       <outputDirectory>apps/</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>target/classes/empty</directory>
+      <outputDirectory>data/</outputDirectory>
+    </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>target/classes/DATA-README.txt</source>
+      <outputDirectory>data/</outputDirectory>
+      <destName>README.txt</destName>
+      <!-- TODO Assembly 2.1 plugin takes a decimal permission instead of octal -->
+      <fileMode>420</fileMode>
+    </file>
+  </files>
   <dependencySets>
     <dependencySet>
       <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>

Added: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/DATA-README.txt
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/DATA-README.txt?rev=611914&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/DATA-README.txt
(added)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/DATA-README.txt
Mon Jan 14 12:16:44 2008
@@ -0,0 +1,2 @@
+This directory contains binary data files for ActiveMQ, HSQLDB and
+the Geronimo transaction manager.
\ No newline at end of file

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=611914&r1=611913&r2=611914&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
Mon Jan 14 12:16:44 2008
@@ -277,7 +277,7 @@
 
     # Url for creating connections
 
-    JdbcUrl jdbc:hsqldb:file:hsqldb
+    JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
 
     # Default user name
 
@@ -463,7 +463,7 @@
     # Url for creating connections
 
     #JdbcUrl jdbc:derby:derbyDB;create=true
-    JdbcUrl jdbc:hsqldb:file:hsqldb
+    JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
 
     # Default user name
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=611914&r1=611913&r2=611914&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Mon Jan 14 12:16:44 2008
@@ -270,7 +270,7 @@
 
     # Url for creating connections
 
-    JdbcUrl jdbc:hsqldb:file:hsqldb
+    JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
 
     # Default user name
 
@@ -456,7 +456,7 @@
     # Url for creating connections
 
     #JdbcUrl jdbc:derby:derbyDB;create=true
-    JdbcUrl jdbc:hsqldb:file:hsqldb
+    JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
 
     # Default user name
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?rev=611914&r1=611913&r2=611914&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
Mon Jan 14 12:16:44 2008
@@ -148,7 +148,7 @@
 
 <Resource id="My DataSource" type="DataSource">
   JdbcDriver org.hsqldb.jdbcDriver
-  JdbcUrl jdbc:hsqldb:file:hsqldb
+  JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
   UserName sa
   Password
   JtaManaged true
@@ -157,7 +157,7 @@
 
 <Resource id="My Unmanaged DataSource" type="DataSource">
   JdbcDriver org.hsqldb.jdbcDriver
-  JdbcUrl jdbc:hsqldb:file:hsqldb
+  JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb
   UserName sa
   Password
   JtaManaged false



Mime
View raw message