svn commit: r534005 - in /ofbiz/trunk/framework: base/lib/ base/src/base/org/ofbiz/base/util/collections/ entity/src/org/ofbiz/entity/ entity/src/org/ofbiz/entity/util/

[jacopoc]

Author: jacopoc
Date: Tue May  1 04:04:15 2007
New Revision: 534005

URL: http://svn.apache.org/viewvc?view=rev&rev=534005
Log:
Upgrade to javolution 4.2.8 (latest stable release).
Note that now java 1.5+ is required.

Added:
    ofbiz/trunk/framework/base/lib/javolution-4.2.8.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/javolution.jar
Modified:
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/MapStack.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java

Added: ofbiz/trunk/framework/base/lib/javolution-4.2.8.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/javolution-4.2.8.jar?view=auto&rev=534005
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/javolution-4.2.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/MapStack.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/MapStack.java?view=diff&rev=534005&r1=534004&r2=534005
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/MapStack.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/MapStack.java Tue May  1 04:04:15 2007
@@ -27,7 +27,7 @@
 import java.util.Set;
 
 import javolution.lang.Reusable;
-import javolution.realtime.ObjectFactory;
+import javolution.context.ObjectFactory;
 import javolution.util.FastList;
 import javolution.util.FastMap;
 import javolution.util.FastSet;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java?view=diff&rev=534005&r1=534004&r2=534005
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java Tue May  1 04:04:15 2007
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 
-import javolution.realtime.ObjectFactory;
+import javolution.context.ObjectFactory;
 
 import org.ofbiz.entity.model.ModelEntity;
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java?view=diff&rev=534005&r1=534004&r2=534005
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java Tue May  1 04:04:15 2007
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 import javolution.lang.Reusable;
-import javolution.realtime.ObjectFactory;
+import javolution.context.ObjectFactory;
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?view=diff&rev=534005&r1=534004&r2=534005
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Tue May  1 04:04:15 2007
@@ -35,10 +35,11 @@
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateHashModel;
-import javolution.lang.Text;
+import javolution.text.CharArray;
+import javolution.text.Text;
 import javolution.util.FastMap;
+import javolution.xml.sax.XMLReaderImpl;
 import javolution.xml.sax.Attributes;
-import javolution.xml.sax.RealtimeParser;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -217,7 +218,7 @@
         }
         */
 
-        RealtimeParser parser = new RealtimeParser(16384);
+        XMLReaderImpl parser = new XMLReaderImpl();
 
         parser.setContentHandler(this);
         parser.setErrorHandler(this);
@@ -280,7 +281,7 @@
 
     public void endDocument() throws org.xml.sax.SAXException {}
 
-    public void endElement(CharSequence namespaceURI, CharSequence localName, CharSequence fullName) throws org.xml.sax.SAXException {
+    public void endElement(CharArray namespaceURI, CharArray localName, CharArray fullName) throws org.xml.sax.SAXException {
         if (Debug.verboseOn()) Debug.logVerbose("endElement: localName=" + localName + ", fullName=" + fullName + ", numberRead=" + numberRead, module);
         String fullNameString = fullName.toString();
         if ("entity-engine-xml".equals(fullNameString)) {
@@ -402,24 +403,24 @@
         }
     }
 
-    public void endPrefixMapping(CharSequence prefix) throws org.xml.sax.SAXException {}
+    public void endPrefixMapping(CharArray prefix) throws org.xml.sax.SAXException {}
 
     public void ignorableWhitespace(char[] values, int offset, int count) throws org.xml.sax.SAXException {
         // String value = new String(values, offset, count);
         // Debug.logInfo("ignorableWhitespace: value=" + value, module);
     }
 
-    public void processingInstruction(CharSequence target, CharSequence instruction) throws org.xml.sax.SAXException {}
+    public void processingInstruction(CharArray target, CharArray instruction) throws org.xml.sax.SAXException {}
 
     public void setDocumentLocator(org.xml.sax.Locator locator) {
         this.locator = locator;
     }
 
-    public void skippedEntity(CharSequence name) throws org.xml.sax.SAXException {}
+    public void skippedEntity(CharArray name) throws org.xml.sax.SAXException {}
 
     public void startDocument() throws org.xml.sax.SAXException {}
 
-    public void startElement(CharSequence namepsaceURI, CharSequence localName, CharSequence fullName, Attributes attributes) throws org.xml.sax.SAXException {
+    public void startElement(CharArray namepsaceURI, CharArray localName, CharArray fullName, Attributes attributes) throws org.xml.sax.SAXException {
         if (Debug.verboseOn()) Debug.logVerbose("startElement: localName=" + localName + ", fullName=" + fullName + ", attributes=" + attributes, module);
         String fullNameString = fullName.toString();
         if ("entity-engine-xml".equals(fullNameString)) {
@@ -534,7 +535,7 @@
     }
 
     //public void startPrefixMapping(String prefix, String uri) throws org.xml.sax.SAXException {}
-    public void startPrefixMapping(CharSequence arg0, CharSequence arg1) throws SAXException {}
+    public void startPrefixMapping(CharArray arg0, CharArray arg1) throws SAXException {}
 
     // ======== ErrorHandler interface implementations ========