You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/09/19 18:47:26 UTC
cvs commit: xml-cocoon2/webapp.tutorial/WEB-INF/db cocoondb.backup cocoondb.data cocoondb.properties cocoondb.script
bloritsch 01/09/19 09:47:26
Modified: . build.xml
webapp.tutorial/WEB-INF cocoon.xconf web.xml
Added: webapp.tutorial/WEB-INF/db cocoondb.backup cocoondb.data
cocoondb.properties cocoondb.script
Log:
Fix build.xml to include missing file. Add db files.
Revision Changes Path
1.63 +1 -0 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 2001/09/19 16:13:18 1.62
+++ build.xml 2001/09/19 16:47:26 1.63
@@ -519,6 +519,7 @@
<copy todir="${build.tutorial.war}" filtering="on">
<fileset dir="${webapp.tutorial.dir}">
<include name="sitemap.xmap"/>
+ <include name="*.xml"/>
<include name="WEB-INF/*.xml"/>
<include name="WEB-INF/*.xconf"/>
<include name="docs/**"/>
1.2 +4 -4 xml-cocoon2/webapp.tutorial/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp.tutorial/WEB-INF/cocoon.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cocoon.xconf 2001/09/19 14:27:59 1.1
+++ cocoon.xconf 2001/09/19 16:47:26 1.2
@@ -235,7 +235,7 @@
That way the test to see if the server has disconnected
the JdbcConnection will function properly.
-->
- <pool-controller min="5" max="10" oradb="true"/>
+ <pool-controller min="5" max="10"/>
<!--
If you need to ensure an autocommit is set to true or
false, then create the "auto-commit" element below.
@@ -244,9 +244,9 @@
The default is true.
-->
- <dburl>jdbc:oracle:thin:@borg:1521:ORADB</dburl>
- <user>test</user>
- <password>test</password>
+ <dburl>@database-url@</dburl>
+ <user>@database-user@</user>
+ <password>@database-password@</password>
</jdbc>
</datasources>
1.2 +3 -3 xml-cocoon2/webapp.tutorial/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp.tutorial/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 2001/09/19 14:27:59 1.1
+++ web.xml 2001/09/19 16:47:26 1.2
@@ -11,8 +11,8 @@
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
<web-app>
- <display-name>Cocoon2 Demo</display-name>
- <description>Demo application for Cocoon2</description>
+ <display-name>Cocoon2 Tutorial</display-name>
+ <description>Tutorial application for Cocoon2</description>
<servlet>
<servlet-name>Cocoon2</servlet-name>
<display-name>Cocoon2</display-name>
@@ -114,7 +114,7 @@
com.ibm.servlet.classloader.Handler -->
<!-- For Database Driver: -->
- oracle.jdbc.driver.OracleDriver
+ @database-driver@
<!-- For parent ComponentManager sample:
org.apache.cocoon.samples.parentcm.Configurator
1.1 xml-cocoon2/webapp.tutorial/WEB-INF/db/cocoondb.backup
<<Binary file>>
1.1 xml-cocoon2/webapp.tutorial/WEB-INF/db/cocoondb.data
<<Binary file>>
1.1 xml-cocoon2/webapp.tutorial/WEB-INF/db/cocoondb.properties
Index: cocoondb.properties
===================================================================
#HSQL database
#Wed Sep 19 11:16:09 EDT 2001
version=1.6
modified=yes
1.1 xml-cocoon2/webapp.tutorial/WEB-INF/db/cocoondb.script
Index: cocoondb.script
===================================================================
CREATE TABLE DEPARTMENT(DEPARTMENT_ID INTEGER NOT NULL,DEPARTMENT_NAME VARCHAR NOT NULL,UNIQUE(DEPARTMENT_ID))
CREATE TABLE EMPLOYEE(EMPLOYEE_ID INTEGER NOT NULL,DEPARTMENT_ID INTEGER NOT NULL,EMPLOYEE_NAME VARCHAR NOT NULL,UNIQUE(EMPLOYEE_ID))
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,'Testors')
INSERT INTO EMPLOYEE VALUES(1,1,'Donald Ball')
INSERT INTO EMPLOYEE VALUES(2,1,'Stefano Mazzocchi')
INSERT INTO EMPLOYEE VALUES(3,2,'Pierpaolo Fumagalli')
INSERT INTO EMPLOYEE VALUES(4,3,'Torsten Curdt')
/*C3*/CONNECT USER sa PASSWORD ""
/*C4*/CONNECT USER sa PASSWORD ""
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org