Changeset 2967

Timestamp:

Nov 28, 2006, 12:40:02 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

References #440: Update to latest versions of 3rd-party software

Updated to Hibernate 3.2.1. Remains to verify that updating works for both Postgres and MySQL.

Location:

trunk

Files:

• bin/set_classpath.bat (modified) (1 diff)
• bin/set_classpath.sh (modified) (1 diff)
• doc/3rd-party-components.txt (modified) (1 diff)
• lib/dist/ehcache-1.2.3.jar (added)
• lib/dist/ehcache-1.2.jar (deleted)
• lib/dist/hibernate3.jar (modified) (previous)
• src/core/net/sf/basedb/core/AbstractSqlQuery.java (modified) (1 diff)
• src/core/net/sf/basedb/core/AnnotationSet.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ReporterList.java (modified) (1 diff)
• src/test/set_classpath.bat (modified) (1 diff)
• src/test/set_classpath.sh (modified) (1 diff)

trunk/bin/set_classpath.bat

@@ -46 +46 @@
 SET CP=%CP%;%WEBINF%/lib/commons-logging-1.0.4.jar
 SET CP=%CP%;%WEBINF%/lib/dom4j-1.6.1.jar
-SET CP=%CP%;%WEBINF%/lib/ehcache-1.2.jar
+SET CP=%CP%;%WEBINF%/lib/ehcache-1.2.3.jar
 SET CP=%CP%;%WEBINF%/lib/jta.jar
 SET CP=%CP%;%WEBINF%/lib/antlr-2.7.6.jar

trunk/bin/set_classpath.sh

@@ -45 +45 @@
 CP=$CP:$WEBINF/lib/commons-logging-1.0.4.jar
 CP=$CP:$WEBINF/lib/dom4j-1.6.1.jar
-CP=$CP:$WEBINF/lib/ehcache-1.2.jar
+CP=$CP:$WEBINF/lib/ehcache-1.2.3.jar
 CP=$CP:$WEBINF/lib/jta.jar
 CP=$CP:$WEBINF/lib/antlr-2.7.6.jar

trunk/doc/3rd-party-components.txt

@@ -180 +180 @@
 
 
+SvnAnt
+------
+An 'ant' task implementation for accessing subversion from the ant buildfile.
 
+More info : http://subclipse.tigris.org/svnant.html
+Version   : 1.0.0
+License   : Apache Software License 1.1 (apache.license.txt)
+Jar files : svnant.jar, javasvn.jar, svnClientAdapter.jar, svnjavahl.jar
+            ganymed.jar
 
-
-

trunk/src/core/net/sf/basedb/core/AbstractSqlQuery.java

@@ -267 +267 @@
     if ((hasLimit || hasOffset) && supportsLimit)
     {
-      sql = dialect.getLimitString(sql, hasOffset && supportsOffset);
+      sql = dialect.getLimitString(sql, getFirstResult(), getMaxResults());
       int insertIndex = dialect.bindLimitParametersFirst() ? 0 : parameterOrder.size();
       parameterOrder.add(insertIndex, "_limit_");

trunk/src/core/net/sf/basedb/core/AnnotationSet.java

@@ -384 +384 @@
     if (annotationType == null) throw new InvalidUseOfNullException("annotationType");
     DbControl dc = getDbControl();
-    Annotation a = dc.getItem(Annotation.class, getData().getAnnotations().remove(annotationType.getData()));
-    if (a != null)
-    {
-      dc.deleteItem(a);
+    if (getData().getAnnotations().containsKey(annotationType.getData()))
+    {
+      AnnotationData ad = getData().getAnnotations().remove(annotationType.getData());
+      if (ad != null)
+      {
+        Annotation a = dc.getItem(Annotation.class, ad);
+        dc.deleteItem(a);
+      }
     }
   }

trunk/src/core/net/sf/basedb/core/ReporterList.java

@@ -208 +208 @@
     checkPermission(Permission.WRITE);
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    ReporterListScoreData rlScore = getData().getReporterListScores().remove(reporter.getId());
-    if (rlScore != null)
+    if (getData().getReporterListScores().containsKey(reporter.getId()))
     {
-      getDbControl().getHibernateSession().delete(rlScore);
+      ReporterListScoreData rlScore = getData().getReporterListScores().remove(reporter.getId());
+      if (rlScore != null)
+      {
+        getDbControl().getHibernateSession().delete(rlScore);
+      }
     }
   }

trunk/src/test/set_classpath.bat

@@ -44 +44 @@
 SET CP=%CP%;../../lib/dist/commons-logging-1.0.4.jar
 SET CP=%CP%;../../lib/dist/dom4j-1.6.1.jar
-SET CP=%CP%;../../lib/dist/ehcache-1.2.jar
+SET CP=%CP%;../../lib/dist/ehcache-1.2.3.jar
 SET CP=%CP%;../../lib/dist/jta.jar
 SET CP=%CP%;../../lib/dist/antlr-2.7.6.jar

trunk/src/test/set_classpath.sh

@@ -45 +45 @@
 CP=$CP:$LIB/commons-logging-1.0.4.jar
 CP=$CP:$LIB/dom4j-1.6.1.jar
-CP=$CP:$LIB/ehcache-1.2.jar
+CP=$CP:$LIB/ehcache-1.2.3.jar
 CP=$CP:$LIB/jta.jar
 CP=$CP:$LIB/antlr-2.7.6.jar