You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2003/11/12 21:40:47 UTC
cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db TurbineDatabaseService.java
mpoeschl 2003/11/12 12:40:47
Modified: . Tag: PRE_AVALON_BRANCH turbine-schema.xml
project.xml scheduler-schema.xml maven.xml
src/java/org/apache/fulcrum/db Tag: PRE_AVALON_BRANCH
TurbineDatabaseService.java
Log:
upgrade to torque-3.1
Revision Changes Path
No revision
No revision
1.2.2.2 +2 -2 jakarta-turbine-fulcrum/Attic/turbine-schema.xml
Index: turbine-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/Attic/turbine-schema.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- turbine-schema.xml 12 Nov 2003 19:37:07 -0000 1.2.2.1
+++ turbine-schema.xml 12 Nov 2003 20:40:47 -0000 1.2.2.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
<!-- ==================================================================== -->
<!-- -->
1.52.2.3 +13 -11 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.52.2.2
retrieving revision 1.52.2.3
diff -u -r1.52.2.2 -r1.52.2.3
--- project.xml 12 Nov 2003 19:55:13 -0000 1.52.2.2
+++ project.xml 12 Nov 2003 20:40:47 -0000 1.52.2.3
@@ -102,7 +102,7 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>2.0</version>
+ <version>2.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
<dependency>
@@ -129,16 +129,12 @@
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.0</version>
- </dependency>
- <dependency>
- <id>commons-util</id>
- <version>SNAPSHOT</version>
+ <version>1.1</version>
</dependency>
<dependency>
<id>cryptix</id>
@@ -186,12 +182,18 @@
</dependency>
<dependency>
<id>torque</id>
- <version>3.0</version>
- <url>http://jakarta.apache.org/turbine/torque/</url>
+ <version>3.1</version>
+ <url>http://db.apache.org/torque/</url>
+ </dependency>
+ <dependency>
+ <groupId>torque</groupId>
+ <artifactId>torque-gen</artifactId>
+ <version>3.1</version>
+ <url>http://db.apache.org/torque/</url>
</dependency>
<dependency>
<id>velocity</id>
- <version>1.3</version>
+ <version>1.3.1</version>
<url>http://jakarta.apache.org/velocity/</url>
</dependency>
<dependency>
@@ -201,7 +203,7 @@
</dependency>
<dependency>
<id>village</id>
- <version>1.5.3</version>
+ <version>2.0-dev-20030825</version>
<url>http://share.whichever.com/index.php?SCREEN=village</url>
</dependency>
<dependency>
1.2.2.1 +2 -2 jakarta-turbine-fulcrum/Attic/scheduler-schema.xml
Index: scheduler-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/Attic/scheduler-schema.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- scheduler-schema.xml 13 Nov 2001 05:35:43 -0000 1.2
+++ scheduler-schema.xml 12 Nov 2003 20:40:47 -0000 1.2.2.1
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
<!-- ==================================================================== -->
<!-- -->
1.7.2.2 +1 -0 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- maven.xml 12 Nov 2003 19:37:07 -0000 1.7.2.1
+++ maven.xml 12 Nov 2003 20:40:47 -0000 1.7.2.2
@@ -135,6 +135,7 @@
outputFile="report.turbine.scheduler.generation"
targetPackage="${schedulerPackage}"
xmlFile="${maven.prepareSourceDirectory}/scheduler-schema.xml"
+ targetDatabase="${database}"
/>
</goal>
No revision
No revision
1.3.2.1 +2 -2 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDatabaseService.java
Index: TurbineDatabaseService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDatabaseService.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TurbineDatabaseService.java 31 Jul 2002 20:37:00 -0000 1.3
+++ TurbineDatabaseService.java 12 Nov 2003 20:40:47 -0000 1.3.2.1
@@ -233,6 +233,6 @@
public String getDefaultMap()
{
- return Torque.getDefaultMap();
+ return Torque.getDefaultDB();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org