Hey,
I'm back to working on a Turbine/Torque-based project after a few months
off and ran into some minor issues with the Torque 3.0 release and
Fulcrum/Turbine-3.
A brief overview of what I had to change to compile Fulcrum with Torque
3 and hence my application:
- Bumped a few version numbers in Fulcrum's project.xml
- Added the torque.retreivableInterface to project.properties
- Fixed a NumberKey -> int in the scheduler
- WordWrapper was gone from commons-util, so I added it back into fulcrum's
util package as WordWrapUtil (it could possibly go to commons-lang as
some of the other commons-util bits did).
I've attached a patch of the first three items. Officially I'm only a
committer on Torque (though sadly inactive at that), but in the
administration of access rights, I do have access to all of the Turbine
projects in CVS, so I could easily commit the changes; , I thought I'd
check with the list first since I've been out of the loop.
Thanks,
Stephen
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.6
diff -u -r1.6 project.properties
--- project.properties 4 Nov 2002 05:36:47 -0000 1.6
+++ project.properties 4 Jan 2003 04:23:10 -0000
@@ -54,3 +54,5 @@
security.database.name = default
scheduler.database.name = default
security.extra.user.columns=
+
+torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.53
diff -u -r1.53 project.xml
--- project.xml 4 Nov 2002 05:36:47 -0000 1.53
+++ project.xml 4 Jan 2003 04:23:11 -0000
@@ -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>
Index: src/java/org/apache/fulcrum/schedule/JobEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/schedule/JobEntry.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 JobEntry.java
--- src/java/org/apache/fulcrum/schedule/JobEntry.java 30 May 2002 02:27:27 -0000
1.1.1.1
+++ src/java/org/apache/fulcrum/schedule/JobEntry.java 4 Jan 2003 04:23:12 -0000
@@ -155,9 +155,7 @@
int result = -1;
if (je instanceof JobEntry)
{
- result = getJobId().getBigDecimal()
- .compareTo(
- ((JobEntry)je).getJobId().getBigDecimal());
+ result = getJobId() - ((JobEntry)je).getJobId();
}
return result;
}
Index: src/java/org/apache/fulcrum/template/TemplateEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/template/TemplateEmail.java,v
retrieving revision 1.4
diff -u -r1.4 TemplateEmail.java
--- src/java/org/apache/fulcrum/template/TemplateEmail.java 17 Sep 2002 22:44:10
-0000 1.4
+++ src/java/org/apache/fulcrum/template/TemplateEmail.java 4 Jan 2003 04:23:13
+-0000
@@ -61,7 +61,7 @@
import javax.mail.internet.InternetAddress;
import org.apache.commons.mail.SimpleEmail;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.util.WordWrapper;
+import org.apache.fulcrum.util.WordWrapUtils;
/**
* This is a simple class for sending email from within the TemplateService.
@@ -460,7 +460,7 @@
// If the caller desires word-wrapping, do it here
if (wordWrap > 0)
{
- body = WordWrapper.wrapText (body,
+ body = WordWrapUtils.wrapText (body,
System.getProperty("line.separator"),
wordWrap);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
