You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by st...@apache.org on 2003/01/06 21:49:19 UTC
cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db TurbineDatabaseService.java
stephenh 2003/01/06 12:49:19
Modified: . jars.list project.properties project.xml
src/java/org/apache/fulcrum/db TurbineDatabaseService.java
Log:
Updated several jar version, including Torque 3.0.
Revision Changes Path
1.10 +5 -5 jakarta-turbine-fulcrum/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/jars.list,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jars.list 14 Aug 2002 14:12:00 -0000 1.9
+++ jars.list 6 Jan 2003 20:49:19 -0000 1.10
@@ -1,6 +1,6 @@
-commons-collections-2.0.jar
-commons-configuration-1.0-dev.jar
-commons-lang-1.0-b1.jar
-log4j-1.2.6.jar
-torque-3.0-b4-dev-20020730.jar
+commons-collections-2.1.jar
+commons-configuration-SNAPSHOT.jar
+commons-lang-1.0.1.jar
+log4j-1.2.7.jar
+torque-3.0.jar
velocity-1.3.jar
1.7 +3 -0 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 4 Nov 2002 05:36:47 -0000 1.6
+++ project.properties 6 Jan 2003 20:49:19 -0000 1.7
@@ -1,4 +1,5 @@
maven.checkstyle.format = turbine
+maven.compile.deprecation = yes
# display the date on the site
maven.xdoc.date = left
@@ -54,3 +55,5 @@
security.database.name = default
scheduler.database.name = default
security.extra.user.columns=
+
+torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
1.55 +5 -5 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- project.xml 6 Jan 2003 10:19:40 -0000 1.54
+++ project.xml 6 Jan 2003 20:49:19 -0000 1.55
@@ -127,7 +127,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>
@@ -136,7 +136,7 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev</version>
+ <version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -149,7 +149,7 @@
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0</version>
+ <version>1.0.1</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -188,7 +188,7 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.6</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<id>javamail</id>
@@ -216,7 +216,7 @@
</dependency>
<dependency>
<id>torque</id>
- <version>SNAPSHOT</version>
+ <version>3.0</version>
<url>http://jakarta.apache.org/turbine/torque/</url>
</dependency>
<dependency>
1.5 +9 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineDatabaseService.java 6 Jan 2003 11:54:43 -0000 1.4
+++ TurbineDatabaseService.java 6 Jan 2003 20:49:19 -0000 1.5
@@ -228,8 +228,15 @@
return Torque.getDefaultDB();
}
+ /**
+ * This method is gone in Torque HEAD, but still in Torque 3.0, so is still
+ * here. It will be removed once Fulcrum moves to the next Torque 3.x.
+ *
+ * @deprecated
+ */
public String getDefaultMap()
{
- return Torque.getDefaultMap();
+ return Torque.getDefaultDB();
}
+
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db
TurbineDatabaseService.java
Posted by Daniel Rall <dl...@collab.net>.
On Mon, 6 Jan 2003, Stephen Haberman wrote:
> (And to clarify the suspicion, Torque.getDefaultMap() is just the
> old name for Torque.getDefaultDB(). I just compiled with the
> deprecated flag and removed the offending call to
> Torque.getDefaultDB(). Though now that I look again, the removal
> needs to be percolated up to the DatabaseService interface and
> TurbineDB.)
That's what I figured.
> Should I completely remove getDefaultMap in Fulcrum or mark it as
> deprecated and keep the current method in the above diff that just
> calls Torque.getDefaultDB?
I like what you did. I'd give it some time marked as deprecated before
removing it entirely.
- Dan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db TurbineDatabaseService.java
Posted by Stephen Haberman <st...@beachead.com>.
On Mon, Jan 06, 2003 at 02:33:23PM -0800, Daniel Rall wrote:
> > + /**
> > + * This method is gone in Torque HEAD, but still in Torque 3.0, so is still
> > + * here. It will be removed once Fulcrum moves to the next Torque 3.x.
> > + *
> > + * @deprecated
> > + */
> > public String getDefaultMap()
> > {
> > - return Torque.getDefaultMap();
> > + return Torque.getDefaultDB();
> > }
> > +
> > }
>
> Your log message doesn't say anything about the commit to
> TurbineDatabaseService.java, which even with a message would look a tad
> suspicious.
Sorry about that; the change was in response to Martin requesting
that I make sure Fulcrum didn't use any of Torque 3.0's deprecated
methods as the methods are now gone in Torque HEAD.
So while I checked off that change in my mind by highlighting the
update to Torque 3.0 in the log message (I did run through the diff
to make sure I was only committing what I intended), but you're
right in that it means nothing to anyone besides myself and perhaps
Martin.
(And to clarify the suspicion, Torque.getDefaultMap() is just the
old name for Torque.getDefaultDB(). I just compiled with the
deprecated flag and removed the offending call to
Torque.getDefaultDB(). Though now that I look again, the removal
needs to be percolated up to the DatabaseService interface and
TurbineDB.)
Should I completely remove getDefaultMap in Fulcrum or mark it as
deprecated and keep the current method in the above diff that just
calls Torque.getDefaultDB?
- Stephen
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db
TurbineDatabaseService.java
Posted by Daniel Rall <dl...@collab.net>.
On 6 Jan 2003 stephenh@apache.org wrote:
> stephenh 2003/01/06 12:49:19
>
> Modified: . jars.list project.properties project.xml
> src/java/org/apache/fulcrum/db TurbineDatabaseService.java
> Log:
> Updated several jar version, including Torque 3.0.
>
> Revision Changes Path
...
> 1.5 +9 -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.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- TurbineDatabaseService.java 6 Jan 2003 11:54:43 -0000 1.4
> +++ TurbineDatabaseService.java 6 Jan 2003 20:49:19 -0000 1.5
> @@ -228,8 +228,15 @@
> return Torque.getDefaultDB();
> }
>
> + /**
> + * This method is gone in Torque HEAD, but still in Torque 3.0, so is still
> + * here. It will be removed once Fulcrum moves to the next Torque 3.x.
> + *
> + * @deprecated
> + */
> public String getDefaultMap()
> {
> - return Torque.getDefaultMap();
> + return Torque.getDefaultDB();
> }
> +
> }
Your log message doesn't say anything about the commit to
TurbineDatabaseService.java, which even with a message would look a tad
suspicious.
Everyone, please diff and review your changes before all commits, and make
sure your log message mentions every portion of your change. Thanks!
- Dan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>