prickett 2002/10/10 23:40:38
Modified: periodicity maven.xml project.properties
periodicity/conf/build build.db.user.properties
periodicity/src/plugins-build/database plugin.jelly
Log:
Removed unneeded jelly scriptiing code in maven.xml
Removed unneeded derived properties from maven.xml
Added a value for periodicity.database.type for testing purposes
Added a value for periodicity.database.port for testing purposes
Imported build.db.user.properties file into the database maven file
Imported build.db.developer.properties into the database maven file
Revision Changes Path
1.11 +1 -14 jakarta-commons-sandbox/periodicity/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 9 Oct 2002 16:15:45 -0000 1.10
+++ maven.xml 11 Oct 2002 06:40:38 -0000 1.11
@@ -8,16 +8,6 @@
<property file="./conf/build/build.db.user.properties"/>
<property file="./conf/build/build.db.developer.properties"/>
- <j:set var="periodicityDatabase" value="${periodicity.database}"/>
-
- <j:choose>
- <j:when test="${periodicityDatabase == 'mysql'}">
- </j:when>
- <j:when test="${periodicityDatabase == 'postgresql'}">
-
- </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";
@@ -43,10 +33,7 @@
</postGoal>
<goal name="view-derived-properties">
- <echo>derived.db.url.scheme="${derived.db.url.scheme}"</echo>
- <echo>derived.db.admin.path="${derived.db.admin.path}"</echo>
- <echo>derived.db.default.port="${derived.db.default.port}"</echo>
- <echo>derived.db.driver="${derived.db.driver}"</echo>
+ <attainGoal name="database"/>
</goal>
<goal name="sql">
1.5 +2 -2 jakarta-commons-sandbox/periodicity/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 7 Oct 2002 14:32:30 -0000 1.4
+++ project.properties 11 Oct 2002 06:40:38 -0000 1.5
@@ -23,7 +23,7 @@
# Default: none
# -------------------------------------------------------------------
-periodicity.database.type=
+periodicity.database.type=mysql
# --------------------------------------------------------------------
#
@@ -73,5 +73,5 @@
#
# --------------------------------------------------------------------
-periodicity.database.host=
+periodicity.database.host=localhost
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.db.user.properties 8 Oct 2002 01:14:32 -0000 1.2
+++ build.db.user.properties 11 Oct 2002 06:40:38 -0000 1.3
@@ -18,7 +18,7 @@
#
# -------------------------------------------------------------------
-periodicity.database.port=
+periodicity.database.port=8080
# -------------------------------------------------------------------
#
@@ -61,7 +61,7 @@
#
# ---------------------------------------------------------------------
-periodicity.database.name=
+periodicity.database.name=periodicity
# ---------------------------------------------------------------------
#
1.3 +13 -7
jakarta-commons-sandbox/periodicity/src/plugins-build/database/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 11 Oct 2002 03:31:35 -0000 1.2
+++ plugin.jelly 11 Oct 2002 06:40:38 -0000 1.3
@@ -1,24 +1,29 @@
<?xml version="1.0"?>
<project xmlns:j="jelly:core">
+ <property file="conf/build/build.db.developer.properties"/>
+ <property file="conf/build/build.db.user.properties"/>
+
<goal name="database">
- <echo>You made it to the database plugin!!!</echo>
+ <echo>You made it to the periodicity database plugin!!!</echo>
+ <attainGoal name="database:derived"/>
</goal>
- <set var="dbType" value="${periodicity.database.type}"/>
+ <j:set var="dbType" value="${periodicity.database.type}"/>
<j:choose>
- <j:when test="${dbType == '${periodicity.mysql.db.name}'">
+
+ <j:when test="${dbType == 'mysql'}">
<j:choose>
<j:otherwise>
<echo>Setting db url for ${periodicity.database.type}</echo>
<property name="derived.db.url"
value="${periodicity.mysql.default.driver.scheme}://${periodicity.database.host}:${periodicity.database.port}/${periodicity.database.name}"/>
</j:otherwise>
</j:choose>
- <j:otherwise>
+ </j:when>
+ <j:otherwise>
<echo>Database Type "${periodicity.database.type}" is not yet
supported</echo>
- </j:otherwise>
- </j:when>
+ </j:otherwise>
</j:choose>
@@ -31,8 +36,9 @@
<goal name="database:driver">
</goal>
- <goal name="view-derived-properties">
+ <goal name="database:derived">
<echo>derived.db.url = "${derived.db.url}"</echo>
+ <echo>scheme="${periodicity.mysql.default.driver.scheme}"</echo>
</goal>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
