jstrachan 2002/11/13 08:55:27
Modified: jelly project.xml project.properties
jelly/src/java/org/apache/commons/jelly/tags/ojb
BrokerTag.java StoreTag.java
jelly/src/java/org/apache/commons/jelly/expression
ExpressionSupport.java CompositeExpression.java
Log:
Fixes for the GUMP build. We now use the latest commons-collections library 2.1 to
remove deprecation warnings
Also moved to OJB 0.9.6 to avoid compile errors
Revision Changes Path
1.90 +2 -2 jakarta-commons-sandbox/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- project.xml 13 Nov 2002 12:59:35 -0000 1.89
+++ project.xml 13 Nov 2002 16:55:26 -0000 1.90
@@ -219,7 +219,7 @@
<dependency>
<id>commons-collections</id>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<dependency>
@@ -409,7 +409,7 @@
<!-- ojb taglib -->
<dependency>
<id>ojb</id>
- <version>0.8.375</version>
+ <version>0.9.6</version>
</dependency>
<!-- scheduler taglib -->
1.12 +1 -1 jakarta-commons-sandbox/jelly/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.properties 22 Jul 2002 14:34:09 -0000 1.11
+++ project.properties 13 Nov 2002 16:55:26 -0000 1.12
@@ -5,7 +5,7 @@
maven.compile.debug = on
maven.compile.optimize = off
-maven.compile.deprecation = off
+maven.compile.deprecation = on
maven.jarResources.basedir=${basedir}/src/java
maven.junit.usefile = true
1.6 +5 -6
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
Index: BrokerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BrokerTag.java 23 Oct 2002 16:27:45 -0000 1.5
+++ BrokerTag.java 13 Nov 2002 16:55:26 -0000 1.6
@@ -54,9 +54,9 @@
*/
package org.apache.commons.jelly.tags.ojb;
-import ojb.broker.PersistenceBroker;
-import ojb.broker.PersistenceBrokerException;
-import ojb.broker.PersistenceBrokerFactory;
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerException;
+import org.apache.ojb.broker.PersistenceBrokerFactory;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
@@ -93,15 +93,14 @@
invokeBody(output);
}
else {
- broker = PersistenceBrokerFactory.createPersistenceBroker();
+ broker = PersistenceBrokerFactory.defaultPersistenceBroker();
context.setVariable(var, broker);
try {
invokeBody(output);
}
finally {
- broker.clearCache();
- PersistenceBrokerFactory.releaseInstance(broker);
+ broker.close();
broker = null;
context.removeVariable(var);
}
1.5 +3 -3
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
Index: StoreTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StoreTag.java 23 Oct 2002 16:27:45 -0000 1.4
+++ StoreTag.java 13 Nov 2002 16:55:27 -0000 1.5
@@ -54,9 +54,9 @@
*/
package org.apache.commons.jelly.tags.ojb;
-import ojb.broker.PersistenceBroker;
-import ojb.broker.PersistenceBrokerException;
-import ojb.broker.PersistenceBrokerFactory;
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerException;
+import org.apache.ojb.broker.PersistenceBrokerFactory;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
1.10 +8 -8
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java
Index: ExpressionSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExpressionSupport.java 30 Oct 2002 19:16:18 -0000 1.9
+++ ExpressionSupport.java 13 Nov 2002 16:55:27 -0000 1.10
@@ -68,9 +68,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.ArrayIterator;
-import org.apache.commons.collections.EnumerationIterator;
-import org.apache.commons.collections.SingletonIterator;
+import org.apache.commons.collections.iterators.ArrayIterator;
+import org.apache.commons.collections.iterators.EnumerationIterator;
+import org.apache.commons.collections.iterators.SingletonIterator;
import org.apache.commons.jelly.JellyContext;
1.4 +1 -1
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
Index: CompositeExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompositeExpression.java 30 Oct 2002 19:16:18 -0000 1.3
+++ CompositeExpression.java 13 Nov 2002 16:55:27 -0000 1.4
@@ -66,7 +66,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.SingletonIterator;
+import org.apache.commons.collections.iterators.SingletonIterator;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
