continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r489871 - in /maven/continuum/trunk/continuum-webapp: pom.xml src/jetty-env.xml
Date Sat, 23 Dec 2006 09:04:58 GMT
Author: evenisse
Date: Sat Dec 23 01:04:57 2006
New Revision: 489871

URL: http://svn.apache.org/viewvc?view=rev&rev=489871
Log:
Move derby and derby.log

Modified:
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/continuum-webapp/src/jetty-env.xml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=489871&r1=489870&r2=489871
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Sat Dec 23 01:04:57 2006
@@ -40,12 +40,6 @@
         <configuration>
           <filesets>
             <fileset>
-              <directory>${basedir}/</directory>
-              <includes>
-                <include>derby.log</include>
-              </includes>
-            </fileset>
-            <fileset>
               <directory>${basedir}/src/main/webapp</directory>
               <includes>
                 <!-- TODO: META-INF shouldn't be required, seems to be an issue with the
current war plugin -->
@@ -191,7 +185,11 @@
           <systemProperties>
             <systemProperty>
               <name>appserver.base</name>
-              <value>${basedir}/target</value>
+              <value>${project.build.directory}/appserver-base</value>
+            </systemProperty>
+            <systemProperty>
+              <name>derby.system.home</name>
+              <value>${project.build.directory}/appserver-base/logs</value>
             </systemProperty>
           </systemProperties>
         </configuration>

Modified: maven/continuum/trunk/continuum-webapp/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/jetty-env.xml?view=diff&rev=489871&r1=489870&r2=489871
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/jetty-env.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/jetty-env.xml Sat Dec 23 01:04:57 2006
@@ -25,7 +25,7 @@
   <Arg>jdbc/continuum</Arg>
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">target/continuum_database</Set>
+      <Set name="DatabaseName">../continuum_database</Set>
       <Set name="user">sa</Set>
       <Set name="createDatabase">create</Set>
     </New>
@@ -35,7 +35,7 @@
   <Arg>jdbc/continuum_shutdown</Arg>
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">target/continuum_database</Set>
+      <Set name="DatabaseName">../continuum_database</Set>
       <Set name="user">sa</Set>
       <Set name="shutdownDatabase">shutdown</Set>
     </New>
@@ -45,7 +45,7 @@
   <Arg>jdbc/users</Arg>
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">target/users_database</Set>
+      <Set name="DatabaseName">../users_database</Set>
       <Set name="user">sa</Set>
       <Set name="createDatabase">create</Set>
     </New>
@@ -55,7 +55,7 @@
   <Arg>jdbc/users_shutdown</Arg>
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">target/users_database</Set>
+      <Set name="DatabaseName">../users_database</Set>
       <Set name="user">sa</Set>
       <Set name="shutdownDatabase">shutdown</Set>
     </New>



Mime
View raw message