Here are a set of patches I've put together to fix some small annoyances
I discovered over the weekend. Also, I've had no problem getting hsql
working with the tdk. It appears that the default configuration of tdk
is being reverted to mysql-- is this permanent? As much as I like mysql,
hsql is much easier to get up and running, so I'd like to voice my
support for using hsql as the default configuration.
-tim
Index: build-tdk.xml
===================================================================
RCS file: /products/cvs/turbine/tdk/build/build-tdk.xml,v
retrieving revision 1.29
diff -u -r1.29 build-tdk.xml
--- build-tdk.xml 2000/09/03 03:25:42 1.29
+++ build-tdk.xml 2000/09/04 21:44:38
@@ -116,9 +116,8 @@
<copyfile src="${turbine.bin}/${turbine.jar}" dest="${tdk.lib}/${turbine.jar}"/>
- <!-- Copy the Turbine MySQL files -->
- <copydir src="${turbine.sql}" dest="${tdk.dist}/share/sql"
- includes="MySQL*.sql, default*.sql"
+ <!-- Copy the Turbine database files -->
+ <copyfile src="${turbine.sql}/default_roles_permissions.sql"
+dest="${tdk.dist}/share/sql/default_roles_permissions.sql"
/>
</target>
@@ -153,7 +152,8 @@
<target name="dist" depends="gather">
<chmod file="${tdk.dist}/bin/tomcat.sh" perm="+x"/>
<chmod file="${tdk.dist}/newapp.sh" perm="+x"/>
- <chmod file="${tdk.dist}/bin/start-turbine.sh" perm="+x"/>
+ <chmod file="${tdk.dist}/bin/startup.sh" perm="+x"/>
+ <chmod file="${tdk.dist}/bin/shutdown.sh" perm="+x"/>
<echo message="Set perms"/>
</target>
Index: build.sh
===================================================================
RCS file: /products/cvs/turbine/tdk/src/share/webmacro/WEB-INF/build/build.sh,v
retrieving revision 1.5
diff -u -r1.5 build.sh
--- build.sh 2000/09/02 19:15:21 1.5
+++ build.sh 2000/09/04 21:45:13
@@ -28,8 +28,8 @@
CP=`echo $CP | sed "s/^://"`
}
-fLoadClassPath @NEWAPP@/lib
-fLoadClassPath @TOMCA_HOME@/lib
+fLoadClassPath ../lib
+fLoadClassPath ../../../../lib
#--------------------------------------------
# No need to edit anything past here
Index: drop
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/tools/torque/config/db/hypersonic/drop,v
retrieving revision 1.3
diff -u -r1.3 drop
--- drop 2000/07/27 01:37:13 1.3
+++ drop 2000/09/04 21:45:28
@@ -0,0 +1 @@
+drop table $table;
Index: newapp.xml
===================================================================
RCS file: /products/cvs/turbine/tdk/src/newapp.xml,v
retrieving revision 1.12
diff -u -r1.12 newapp.xml
--- newapp.xml 2000/09/03 02:58:30 1.12
+++ newapp.xml 2000/09/04 22:17:51
@@ -60,23 +60,33 @@
filtering="on"
/>
+ <copyfile
+ src="share/sql/default_roles_permissions.sql"
+ dest="${newapp.src}/default_roles_permissions.sql"
+ />
+
<!-- Create the initial schema -->
<torque props="${newapp.torque}/torque.props"
macros="${newapp.torque}/torque.macros"/>
<!-- Create the database -->
- <property name="database.userid" value=""/>
+ <property name="database.userid" value="sa"/>
<property name="database.password" value=""/>
- <!-- *** Disabled for now. Using MySQL instead.
<property name="database.driver" value="org.hsql.jdbcDriver"/>
<property name="database.url"
value="jdbc:HypersonicSQL:${newapp.db}/turbine"/>
+
<sql driver="${database.driver}" url="${database.url}"
userid="${database.userid}" password="${database.password}"
src="${newapp.src}/system.sql"
/>
+
+ <sql driver="${database.driver}" url="${database.url}"
+ userid="${database.userid}" password="${database.password}"
+ src="${newapp.src}/default_roles_permissions.sql"
+ />
+
<echo message="Database creation complete!"/>
- -->
<!-- Copy the Turbine properties file with the proper database props -->
<filter token="DATABASE_DRIVER" value="${database.driver}"/>
@@ -98,6 +108,9 @@
filtering="on"
excludes="**/*.class"
/>
+
+ <chmod file="${newapp.home}/WEB-INF/build/build.sh" perm="+x"/>
+
<echo message="copied all share/webmacro without classes"/>
<!-- Compile the newly-built OM classes and all other source -->
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
