tcurdt 2003/03/12 03:08:59
Modified: . build.properties
src/blocks/databases build.xml
src/blocks/databases/conf datasources.xconf
src/blocks/databases/samples/xsp esql.xsp
tools/src blocks-build.xsl
Added: src/blocks/databases/conf cocoondb.properties
cocoondb.script
Log:
fixed the samples:
removed the sample database properties from the build,
have the hsqldb be filled from the beginning,
introduced the ant "block.dir" property for the current block path
Revision Changes Path
1.3 +0 -5 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 11 Mar 2003 02:05:37 -0000 1.2
+++ build.properties 12 Mar 2003 11:08:58 -0000 1.3
@@ -18,11 +18,6 @@
#exclude.scratchpad=true
#exclude.deprecated=true
-samples.database.driver=org.hsqldb.jdbcDriver
-samples.database.url=jdbc:hsqldb:hsql://localhost:9002
-samples.database.user=sa
-samples.database.password=
-
# ---- Build -------------------------------------------------------------------
build.root=build
1.2 +6 -16 cocoon-2.1/src/blocks/databases/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 9 Mar 2003 00:03:01 -0000 1.1
+++ build.xml 12 Mar 2003 11:08:58 -0000 1.2
@@ -1,19 +1,9 @@
-<project default="main" basedir=".">
+<project default="main" >
- <target name="main" depends="prepare-database-connection"/>
-
- <target name="prepare-database-connection"
depends="prepare-database-connection-pw,prepare-database-connection-no-pw">
- <filter token="db_driver" value="${webapp.samples.database.driver}"/>
- <filter token="db_url" value="${webapp.samples.database.url}"/>
- <filter token="db_user" value="${webapp.samples.database.user}"/>
- </target>
-
- <target name="prepare-database-connection-pw"
if="webapp.samples.database.password">
- <filter token="db_password"
value="{string('${webapp.samples.database.password}')}"/>
+ <target name="main">
+ <mkdir dir="${build.webapp.webinf}/db"/>
+ <copy file="${block.dir}/conf/cocoondb.script"
tofile="${build.webapp.webinf}/db/cocoondb.script"/>
+ <copy file="${block.dir}/conf/cocoondb.properties"
tofile="${build.webapp.webinf}/db/cocoondb.properties"/>
</target>
-
- <target name="prepare-database-connection-no-pw"
unless="webapp.samples.database.password">
- <filter token="db_password" value=""/>
- </target>
-
+
</project>
1.2 +3 -3 cocoon-2.1/src/blocks/databases/conf/datasources.xconf
Index: datasources.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/conf/datasources.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- datasources.xconf 9 Mar 2003 00:03:01 -0000 1.1
+++ datasources.xconf 12 Mar 2003 11:08:58 -0000 1.2
@@ -22,9 +22,9 @@
The default is true.
-->
- <dburl>@db_url@</dburl>
- <user>@db_user@</user>
- <password>@db_password@</password>
+ <dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
+ <user>sa</user>
+ <password></password>
</jdbc>
</datasources>
</xconf>
1.1 cocoon-2.1/src/blocks/databases/conf/cocoondb.properties
Index: cocoondb.properties
===================================================================
#HSQL database
#Tue Mar 11 17:17:57 CET 2003
sql.strict_fk=true
readonly=false
sql.strong_fk=true
hsqldb.version=1.7.1
version=1.7.1
hsqldb.cache_scale=14
sql.compare_in_locale=false
sql.month=true
hsqldb.log_size=200
modified=no
hsqldb.cache_version=1.7.0
hsqldb.original_version=1.7.1
hsqldb.compatible_version=1.7.0
sql.enforce_size=false
1.1 cocoon-2.1/src/blocks/databases/conf/cocoondb.script
Index: cocoondb.script
===================================================================
CREATE TABLE DEPARTMENT(ID INTEGER NOT NULL,NAME VARCHAR NOT NULL,UNIQUE(ID))
CREATE TABLE EMPLOYEE(ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,NAME
VARCHAR NOT NULL,UNIQUE(ID))
CREATE TABLE USER(UID INTEGER IDENTITY PRIMARY KEY,NAME VARCHAR,FIRSTNAME
VARCHAR,UNAME VARCHAR,UNIQUE(UNAME))
CREATE TABLE GROUPS(GID INTEGER IDENTITY PRIMARY KEY,GNAME VARCHAR,UNIQUE(GNAME))
CREATE TABLE USER_GROUPS(UID INTEGER,GID INTEGER,UNIQUE(UID,GID),FOREIGN
KEY(UID)REFERENCES USER(UID),FOREIGN KEY(GID)REFERENCES GROUPS(GID))
CREATE TABLE STATE_TAX(CATEGORY VARCHAR NOT NULL,GROSSTAX_COLLECTED DOUBLE NOT
NULL,NETTAX_COLLECTED DOUBLE NOT NULL,YEAR INTEGER NOT NULL)
CREATE TABLE MEDIA(ID INTEGER IDENTITY PRIMARY KEY,IMAGE BINARY,MIMETYPE VARCHAR)
GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
CREATE USER SA PASSWORD "" ADMIN
CREATE ALIAS DAYNAME FOR "org.hsqldb.Library.dayname"
CREATE ALIAS SPACE FOR "org.hsqldb.Library.space"
CREATE ALIAS SUBSTRING FOR "org.hsqldb.Library.substring"
CREATE ALIAS SQRT FOR "java.lang.Math.sqrt"
CREATE ALIAS ABS FOR "java.lang.Math.abs"
CREATE ALIAS POWER FOR "java.lang.Math.pow"
CREATE ALIAS CHAR FOR "org.hsqldb.Library.character"
CREATE ALIAS CONCAT FOR "org.hsqldb.Library.concat"
CREATE ALIAS PI FOR "org.hsqldb.Library.pi"
CREATE ALIAS SECOND FOR "org.hsqldb.Library.second"
CREATE ALIAS TRUNCATE FOR "org.hsqldb.Library.truncate"
CREATE ALIAS MONTH FOR "org.hsqldb.Library.month"
CREATE ALIAS LOWER FOR "org.hsqldb.Library.lcase"
CREATE ALIAS ATAN2 FOR "java.lang.Math.atan2"
CREATE ALIAS REPEAT FOR "org.hsqldb.Library.repeat"
CREATE ALIAS DAYOFMONTH FOR "org.hsqldb.Library.dayofmonth"
CREATE ALIAS TAN FOR "java.lang.Math.tan"
CREATE ALIAS RADIANS FOR "java.lang.Math.toRadians"
CREATE ALIAS FLOOR FOR "java.lang.Math.floor"
CREATE ALIAS NOW FOR "org.hsqldb.Library.now"
CREATE ALIAS ACOS FOR "java.lang.Math.acos"
CREATE ALIAS DAYOFWEEK FOR "org.hsqldb.Library.dayofweek"
CREATE ALIAS CEILING FOR "java.lang.Math.ceil"
CREATE ALIAS DAYOFYEAR FOR "org.hsqldb.Library.dayofyear"
CREATE ALIAS LCASE FOR "org.hsqldb.Library.lcase"
CREATE ALIAS WEEK FOR "org.hsqldb.Library.week"
CREATE ALIAS SOUNDEX FOR "org.hsqldb.Library.soundex"
CREATE ALIAS ASIN FOR "java.lang.Math.asin"
CREATE ALIAS LOCATE FOR "org.hsqldb.Library.locate"
CREATE ALIAS EXP FOR "java.lang.Math.exp"
CREATE ALIAS MONTHNAME FOR "org.hsqldb.Library.monthname"
CREATE ALIAS YEAR FOR "org.hsqldb.Library.year"
CREATE ALIAS LEFT FOR "org.hsqldb.Library.left"
CREATE ALIAS ROUNDMAGIC FOR "org.hsqldb.Library.roundMagic"
CREATE ALIAS BITOR FOR "org.hsqldb.Library.bitor"
CREATE ALIAS LTRIM FOR "org.hsqldb.Library.ltrim"
CREATE ALIAS COT FOR "org.hsqldb.Library.cot"
CREATE ALIAS COS FOR "java.lang.Math.cos"
CREATE ALIAS MOD FOR "org.hsqldb.Library.mod"
CREATE ALIAS SIGN FOR "org.hsqldb.Library.sign"
CREATE ALIAS DEGREES FOR "java.lang.Math.toDegrees"
CREATE ALIAS LOG FOR "java.lang.Math.log"
CREATE ALIAS SIN FOR "java.lang.Math.sin"
CREATE ALIAS CURTIME FOR "org.hsqldb.Library.curtime"
CREATE ALIAS DIFFERENCE FOR "org.hsqldb.Library.difference"
CREATE ALIAS INSERT FOR "org.hsqldb.Library.insert"
CREATE ALIAS SUBSTR FOR "org.hsqldb.Library.substring"
CREATE ALIAS DATABASE FOR "org.hsqldb.Library.database"
CREATE ALIAS MINUTE FOR "org.hsqldb.Library.minute"
CREATE ALIAS HOUR FOR "org.hsqldb.Library.hour"
CREATE ALIAS IDENTITY FOR "org.hsqldb.Library.identity"
CREATE ALIAS QUARTER FOR "org.hsqldb.Library.quarter"
CREATE ALIAS CURDATE FOR "org.hsqldb.Library.curdate"
CREATE ALIAS BITAND FOR "org.hsqldb.Library.bitand"
CREATE ALIAS USER FOR "org.hsqldb.Library.user"
CREATE ALIAS UCASE FOR "org.hsqldb.Library.ucase"
CREATE ALIAS RTRIM FOR "org.hsqldb.Library.rtrim"
CREATE ALIAS LOG10 FOR "org.hsqldb.Library.log10"
CREATE ALIAS RIGHT FOR "org.hsqldb.Library.right"
CREATE ALIAS ATAN FOR "java.lang.Math.atan"
CREATE ALIAS UPPER FOR "org.hsqldb.Library.ucase"
CREATE ALIAS ASCII FOR "org.hsqldb.Library.ascii"
CREATE ALIAS RAND FOR "java.lang.Math.random"
CREATE ALIAS LENGTH FOR "org.hsqldb.Library.length"
CREATE ALIAS ROUND FOR "org.hsqldb.Library.round"
CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace"
INSERT INTO DEPARTMENT VALUES(1,'Development')
INSERT INTO DEPARTMENT VALUES(2,'Management')
INSERT INTO DEPARTMENT VALUES(3,'Testers')
INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball')
INSERT INTO EMPLOYEE VALUES(2,1,'Sylvain Wallez ')
INSERT INTO EMPLOYEE VALUES(3,1,'Carsten Ziegeler ')
INSERT INTO EMPLOYEE VALUES(4,1,'Torsten Curdt')
INSERT INTO EMPLOYEE VALUES(5,1,'Marcus Crafter')
INSERT INTO EMPLOYEE VALUES(6,1,'Ovidiu Predescu')
INSERT INTO EMPLOYEE VALUES(7,1,'Christian Haul')
INSERT INTO EMPLOYEE VALUES(8,2,'Stefano Mazzocchi')
INSERT INTO EMPLOYEE VALUES(9,3,'Pierpaolo Fumagalli')
INSERT INTO EMPLOYEE VALUES(10,3,'Davanum Srinivas')
INSERT INTO STATE_TAX VALUES('State Sales And Use',6.263250997E9,6.213961851E9,2000)
INSERT INTO STATE_TAX VALUES('Local Sales And Use',1.321129345E9,1.321129345E9,2000)
INSERT INTO STATE_TAX VALUES('Resort Area Excise',718624.0,718624.0,2000)
INSERT INTO STATE_TAX VALUES('State Personal
Income',8.983891961E9,8.084576329E9,2000)
INSERT INTO STATE_TAX VALUES('Corporation
Franchise',1.219484766E9,1.029883951E9,2000)
INSERT INTO STATE_TAX VALUES('Motor Vehicle Fuel',1.418996649E9,1.404945725E9,2000)
INSERT INTO STATE_TAX VALUES('Public Utility Excise',7.04245493E8,6.75339746E8,2000)
INSERT INTO STATE_TAX VALUES('Kilowatt-Hour Excise',0.0,0.0,2000)
INSERT INTO STATE_TAX VALUES('Cigarette Excise',2.89795508E8,2.87710095E8,2000)
INSERT INTO STATE_TAX VALUES('Dealers in Intangibles',5055311.0,2.2333722E7,2000)
INSERT INTO STATE_TAX VALUES('Motor Fuel Use',2.2615436E7,6.6889345E7,2000)
INSERT INTO STATE_TAX VALUES('Alchoholic Beverage
Excise',5.6125329E7,5.5993783E7,2000)
INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3339367.0,3339367.0,2000)
INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',6284465.0,5851787.0,2000)
INSERT INTO STATE_TAX VALUES('Horse Racing',1.6582056E7,1.7321198E7,2000)
INSERT INTO STATE_TAX VALUES('Severance',8295336.0,7981539.0,2000)
INSERT INTO STATE_TAX VALUES('School District Income',1.50083042E8,1.61257059E8,2000)
INSERT INTO STATE_TAX VALUES('State Sales And Use',6.287758244E9,6.23711041E9,2001)
INSERT INTO STATE_TAX VALUES('Local Sales And Use',1.352436625E9,1.352436625E9,2001)
INSERT INTO STATE_TAX VALUES('Resort Area Excise',719420.0,719420.0,2001)
INSERT INTO STATE_TAX VALUES('State Personal
Income',9.221429278E9,8.119314587E9,2001)
INSERT INTO STATE_TAX VALUES('Corporation Franchise',1.158910767E9,9.72967198E8,2001)
INSERT INTO STATE_TAX VALUES('Motor Vehicle Fuel',1.325132798E9,1.307275001E9,2001)
INSERT INTO STATE_TAX VALUES('Public Utility Excise',6.91925015E8,6.7431469E8,2001)
INSERT INTO STATE_TAX VALUES('Kilowatt-Hour Excise',3.8026261E7,3.8026261E7,2001)
INSERT INTO STATE_TAX VALUES('Cigarette Excise',2.83978172E8,2.82481419E8,2001)
INSERT INTO STATE_TAX VALUES('Dealers in Intangibles',2.4913075E7,2.4881108E7,2001)
INSERT INTO STATE_TAX VALUES('Motor Fuel Use',7.5662992E7,7.5311561E7,2001)
INSERT INTO STATE_TAX VALUES('Alchoholic Beverage
Excise',5.5862063E7,5.5740722E7,2001)
INSERT INTO STATE_TAX VALUES('Replacement Tire Fee',3470795.0,3470795.0,2001)
INSERT INTO STATE_TAX VALUES('Local Alchoholic Beverage',5851787.0,5851787.0,2001)
INSERT INTO STATE_TAX VALUES('Horse Racing',1.7921198E7,1.7321198E7,2001)
INSERT INTO STATE_TAX VALUES('Severance',7981539.0,7967438.0,2001)
INSERT INTO STATE_TAX VALUES('School District Income',1.61257059E8,1.53238001E8,2001)
1.2 +2 -2 cocoon-2.1/src/blocks/databases/samples/xsp/esql.xsp
Index: esql.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/xsp/esql.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- esql.xsp 9 Mar 2003 00:03:31 -0000 1.1
+++ esql.xsp 12 Mar 2003 11:08:59 -0000 1.2
@@ -10,7 +10,7 @@
<title>A Database Driven XSP Page</title>
<resources>
<resource type="file" href="../transform/sql-page.xml.sql">Schema</resource>
- <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+ <resource type="doc" href="userdocs/xsp/esql">ESQL</resource>
</resources>
<content>
1.4 +7 -1 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blocks-build.xsl 11 Mar 2003 02:29:53 -0000 1.3
+++ blocks-build.xsl 12 Mar 2003 11:08:59 -0000 1.4
@@ -200,7 +200,13 @@
</target>
<target name="{$block-name}-build" if="{$block-name}.has.build">
- <ant inheritAll="true" inheritRefs="false" target="main"
antfile="{string('${blocks}')}/{$block-name}/build.xml"/>
+ <ant inheritAll="true"
+ inheritRefs="false"
+ target="main"
+ antfile="{string('${blocks}')}/{$block-name}/build.xml"
+ >
+ <property name="block.dir"
value="{string('${blocks}')}/{$block-name}"/>
+ </ant>
</target>
<target name="{$block-name}-mocks" if="{$block-name}.has.mocks">
