Author: handyande
Date: Wed Jan 31 13:49:36 2007
New Revision: 502009
URL: http://svn.apache.org/viewvc?view=rev&rev=502009
Log:
Make the data root configurable. default is $\{plexus.home\}/data can be
overridden with the enterprise.dataDir property.
passing -Denterprise.install will set it to ~/.enterprise
Modified:
maven/sandbox/enterprise/enterprise-runtime/pom.xml
maven/sandbox/enterprise/enterprise-runtime/src/conf/plexus.xml
Modified: maven/sandbox/enterprise/enterprise-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/enterprise/enterprise-runtime/pom.xml?view=diff&rev=502009&r1=502008&r2=502009
==============================================================================
--- maven/sandbox/enterprise/enterprise-runtime/pom.xml (original)
+++ maven/sandbox/enterprise/enterprise-runtime/pom.xml Wed Jan 31 13:49:36 2007
@@ -118,7 +118,7 @@
</execution>
</executions>
<configuration>
- <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
+
<runtimeConfiguration>target/generated-resources/plexus.xml</runtimeConfiguration>
<runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
<runtimePath>target/plexus-app-runtime</runtimePath>
<additionalCoreArtifacts>
@@ -141,5 +141,37 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/conf</directory>
+ <targetPath>../generated-resources</targetPath>
+ <includes>
+ <include>plexus.xml</include>
+ </includes>
+ </resource>
+ </resources>
</build>
+
+ <profiles>
+ <profile>
+ <activation>
+ <property><name>!enterprise.dataDir</name></property>
+ </activation>
+
+ <properties>
+ <enterprise.dataDir>${plexus.home}/data</enterprise.dataDir>
+ </properties>
+ </profile>
+
+ <profile>
+ <activation>
+ <property><name>enterprise.install</name></property>
+ </activation>
+
+ <properties>
+ <enterprise.dataDir>${user.home}/.enterprise</enterprise.dataDir>
+ </properties>
+ </profile>
+ </profiles>
</project>
Modified: maven/sandbox/enterprise/enterprise-runtime/src/conf/plexus.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/enterprise/enterprise-runtime/src/conf/plexus.xml?view=diff&rev=502009&r1=502008&r2=502009
==============================================================================
--- maven/sandbox/enterprise/enterprise-runtime/src/conf/plexus.xml (original)
+++ maven/sandbox/enterprise/enterprise-runtime/src/conf/plexus.xml Wed Jan 31
13:49:36 2007
@@ -22,7 +22,7 @@
<environment>
<name>enterprise/dataDir</name>
<type>java.lang.String</type>
- <value>${plexus.home}/data</value>
+ <value>${enterprise.dataDir}</value>
</environment>
</environments>
</configuration>
@@ -63,7 +63,7 @@
</property>
<property>
<name>url</name>
-
<value>jdbc:derby:${plexus.home}/data/users/database;create=true</value>
+
<value>jdbc:derby:${enterprise.dataDir}/users/database;create=true</value>
</property>
<property>
<name>username</name>
@@ -85,7 +85,7 @@
</property>
<property>
<name>url</name>
-
<value>jdbc:derby:${plexus.home}/data/continuum/database;create=true</value>
+
<value>jdbc:derby:${enterprise.dataDir}/continuum/database;create=true</value>
</property>
<property>
<name>username</name>
