prickett 2002/10/07 18:14:32
Modified: periodicity maven.xml project.xml
periodicity/conf/build build.db.developer.properties
build.db.user.properties
Log:
Split the build.db.properties file into two different files
1. build.db.user.properties
2. build.db.developer.properties
Revision Changes Path
1.8 +8 -4 jakarta-commons-sandbox/periodicity/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 7 Oct 2002 04:12:48 -0000 1.7
+++ maven.xml 8 Oct 2002 01:14:32 -0000 1.8
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="java:jar" xmlns:j="jelly:core">
-
<property file="./conf/build/build.properties"/>
<property file="./conf/build/build.jars.properties"/>
<property file="./conf/build/build.torque.properties"/>
<property file="./conf/build/build.torque.default.properties"/>
<property file="./conf/build/build.torque.period.properties"/>
- <property file="./conf/build/build.db.properties"/>
+ <property file="./conf/build/build.db.user.properties"/>
+ <property file="./conf/build/build.db.developer.properties"/>
<j:set var="periodicityDatabase" value="${periodicity.database}"/>
@@ -18,6 +18,12 @@
</j:when>
</j:choose>
+ <postGoal name="java:prepare-filesystem">
+ <mkdir dir="${maven.repo.local}/${periodicity.axion.db.name}/jars"/>
+ <get
src="http://www.ibiblio.org/maven/${periodicity.axion.db.name}/jars/${periodicity.axion.db.name}-${periodicity.axion.database.default.version}.jar";
+
dest="${maven.repo.local}/${periodicity.axion.db.name}/jars/${periodicity.axion.db.name}-${periodicity.axion.database.default.version}.jar"/>
+ </postGoal>
+
<preGoal name="java:compile">
<ant antfile="build-legacy.xml" target="om"/>
</preGoal>
@@ -38,5 +44,3 @@
</goal>
</project>
-
-
1.7 +3 -4 jakarta-commons-sandbox/periodicity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 7 Oct 2002 21:03:44 -0000 1.6
+++ project.xml 8 Oct 2002 01:14:32 -0000 1.7
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
-
-
+ <property file="conf/build/build.db.users.proeprties"/>
<pomVersion>3</pomVersion>
<name>Periodicity</name>
<id>periodicity</id>
@@ -79,8 +78,8 @@
</dependency>
<dependency>
<id>axion</id>
- <version>1.0-dev.20020822.054820</version>
- </dependency>
+ <version>${periodicity.axion.database.version}</version>
+ </dependency>
</dependencies>
<build>
1.2 +1 -0
jakarta-commons-sandbox/periodicity/conf/build/build.db.developer.properties
Index: build.db.developer.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.db.developer.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.db.developer.properties 7 Oct 2002 04:12:48 -0000 1.1
+++ build.db.developer.properties 8 Oct 2002 01:14:32 -0000 1.2
@@ -80,6 +80,7 @@
# ------------------------------------------------------------------
periodicity.axion.db.name=axion
+periodicity.axion.database.default.version=1.0-dev.20020830.060007
# ------------------------------------------------------------------
#
1.2 +16 -0
jakarta-commons-sandbox/periodicity/conf/build/build.db.user.properties
Index: build.db.user.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.db.user.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.db.user.properties 7 Oct 2002 04:12:48 -0000 1.1
+++ build.db.user.properties 8 Oct 2002 01:14:32 -0000 1.2
@@ -62,3 +62,19 @@
# ---------------------------------------------------------------------
periodicity.database.name=
+
+# ---------------------------------------------------------------------
+#
+# P E R I O D I C I T Y A X I O N D A T A B A S E V E R S I O N
+#
+# This periodicity server setting tells the periodicity server the version
+# of the axion database that should be used by the server.
+# If the periodicity server is not using the axion database this server
+# setting is ignored. If the periodicity server is using the axion database
+# and this setting is not speficied it will use the default version
+# of the axion database which is specified in the Axion Database Settings
+# in the build.db.developers file.
+#
+# -----------------------------------------------------------------------
+
+periodicity.axion.database.version=
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
