Changeset 3050


Ignore:
Timestamp:
Jan 8, 2007, 1:44:46 PM (15 years ago)
Author:
Nicklas Nordborg
Message:

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

Built Hibernate from subversion source (revision #11018), updated to latest C3P0.
Fixed one issue with JOIN ... WITH syntax.

Location:
trunk
Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/set_classpath.bat

    r2967 r3050  
    5454
    5555REM C3P0 Connection pool manager
    56 SET CP=%CP%;%WEBINF%/lib/c3p0-0.9.0.jar
     56SET CP=%CP%;%WEBINF%/lib/c3p0-0.9.1-pre12.jar
    5757
    5858REM MySQL JDBC driver
  • trunk/bin/set_classpath.sh

    r2967 r3050  
    5353
    5454# C3P0 Connection pool manager
    55 CP=$CP:$WEBINF/lib/c3p0-0.9.0.jar
     55CP=$CP:$WEBINF/lib/c3p0-0.9.1-pre12.jar
    5656
    5757# MySQL JDBC driver
  • trunk/doc/3rd-party-components.txt

    r2967 r3050  
    3939
    4040More info : http://www.hibernate.org/
    41 Version   : 3.2.0.cr3
     41Version   : 3.2.2 (built from subversion source revision #11018)
    4242License   : LGPL (hibernate.license.txt)
    4343Jar files : hibernate3.jar, antlr-2.7.6.jar, asm.jar, asm-attrs.jar,
    4444            cglib-2.1.3.jar, commons-collections-2.1.1.jar, commons-logging-1.0.4.jar
    4545            dom4j-1.6.1.jar, ehcache-1.2.jar, jta.jar, log4j-1.2.11.jar,
    46             c3p0-0.9.0.jar
     46            c3p0-0.9.1-pre12.jar
    4747
    4848Note: Most of the jar files above are other 3rd-party components used by Hibernate.
  • trunk/src/core/common-queries.xml

    r2993 r3050  
    17861786      JOIN plg.guiContexts gcx
    17871787      LEFT JOIN plg.configurations cfg
    1788         WITH cfg.owner = :owner OR cfg.itemKey IN (:itemKeys) OR cfg.projectKey IN (:projectKeys)
     1788        WITH cfg.owner.id = :owner OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
    17891789      WHERE
    1790       (plg.owner = :owner OR plg.itemKey IN (:itemKeys) OR plg.projectKey IN (:projectKeys))
     1790      (plg.owner.id = :owner OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
    17911791      AND gcx.itemType = :itemType AND gcx.contextType = :contextType
    17921792      AND (
     
    18001800      A Hibernate query that counts the number of plugins available for a
    18011801      given GUI context grouped by the main type of the plugins taking
    1802       the requirement of configurations into account.
     1802      the requirement of configurations and user permissions into account.
    18031803    </description>
    18041804  </query>
  • trunk/src/core/net/sf/basedb/core/PluginDefinition.java

    r2981 r3050  
    272272      JOIN plg.guiContexts gcx
    273273      LEFT JOIN plg.configurations cfg
    274         WITH cfg.owner = :owner OR cfg.itemKey IN (:itemKeys) OR cfg.projectKey IN (:projectKeys)
     274        WITH cfg.owner.id = :owner OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
    275275      WHERE
    276       (plg.owner = :owner OR plg.itemKey IN (:itemKeys) OR plg.projectKey IN (:projectKeys))
     276      (plg.owner.id = :owner OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
    277277      AND gcx.itemType = :itemType AND gcx.contextType = :contextType
    278278      AND (
  • trunk/src/test/set_classpath.bat

    r2967 r3050  
    5252
    5353REM C3P0 Connection pool manager
    54 SET CP=%CP%;../../lib/dist/c3p0-0.9.0.jar
     54SET CP=%CP%;../../lib/dist/c3p0-0.9.1-pre12.jar
    5555
    5656REM MySQL JDBC driver
  • trunk/src/test/set_classpath.sh

    r2967 r3050  
    5353
    5454# C3P0 Connection pool manager
    55 CP=$CP:$LIB/c3p0-0.9.0.jar
     55CP=$CP:$LIB/c3p0-0.9.1-pre12.jar
    5656
    5757# MySQL JDBC driver
Note: See TracChangeset for help on using the changeset viewer.