Changeset 3452


Ignore:
Timestamp:
Jun 5, 2007, 1:58:36 PM (14 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #558 and #568

Location:
trunk
Files:
1 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/set_classpath.bat

    r3379 r3452  
    6060
    6161REM MySQL JDBC driver
    62 SET CP=%CP%;%WEBINF%/lib/mysql-connector-java-5.0.4-bin.jar
     62SET CP=%CP%;%WEBINF%/lib/mysql-connector-java-5.0.6-bin.jar
    6363
    6464REM Postgres JDBC driver
  • trunk/bin/set_classpath.sh

    r3379 r3452  
    5959
    6060# MySQL JDBC driver
    61 CP=$CP:$WEBINF/lib/mysql-connector-java-5.0.4-bin.jar
     61CP=$CP:$WEBINF/lib/mysql-connector-java-5.0.6-bin.jar
    6262
    6363# Postgres JDBC driver
  • trunk/doc/3rd-party-components.txt

    r3190 r3452  
    3434
    3535
    36 Hibernate 3.1
    37 -------------
     36Hibernate 3
     37-----------
    3838An object/relational persistence and query service for Java. Shields
    3939us from most SQL and gives us database independece.
    4040
    4141More info : http://www.hibernate.org/
    42 Version   : 3.2.2.GA
     42Version   : 3.2.4.SP1
    4343License   : LGPL (hibernate.license.txt)
    4444Jar files : hibernate3.jar, antlr-2.7.6.jar, asm.jar, asm-attrs.jar,
    4545            cglib-2.1.3.jar, commons-collections-2.1.1.jar, commons-logging-1.0.4.jar
    46             dom4j-1.6.1.jar, ehcache-1.2.jar, jta.jar, log4j-1.2.11.jar,
    47             c3p0-0.9.1.jar
     46            dom4j-1.6.1.jar, ehcache-1.2.3.jar, jta.jar, c3p0-0.9.1.jar
    4847
    4948Note: Most of the jar files above are other 3rd-party components used by Hibernate.
     
    115114
    116115More info : http://www.mysql.com/products/connector/j/
    117 Version   : 5.0.4
     116Version   : 5.0.6
    118117License   : GPL (gpl.license.txt)
    119 Jar files : mysql-connector-java-5.0.4-bin.jar
     118Jar files : mysql-connector-java-5.0.6-bin.jar
    120119
    121120
  • trunk/src/core/net/sf/basedb/core/ItemContext.java

    r2993 r3452  
    956956            String filterProperty = filter.getProperty();
    957957            int dotIndex = filterProperty == null ? -1 : filterProperty.lastIndexOf(".");
    958             if (dotIndex >= 0)
     958            if (dotIndex >= 0 && !filterProperty.startsWith("$"))
    959959            {
    960960              leftJoins.add(filterProperty.substring(0, dotIndex));
  • trunk/src/test/set_classpath.bat

    r3085 r3452  
    5555
    5656REM MySQL JDBC driver
    57 SET CP=%CP%;../../lib/dist/mysql-connector-java-5.0.4-bin.jar
     57SET CP=%CP%;../../lib/dist/mysql-connector-java-5.0.6-bin.jar
    5858
    5959REM Postgres JDBC driver
  • trunk/src/test/set_classpath.sh

    r3085 r3452  
    5656
    5757# MySQL JDBC driver
    58 CP=$CP:$LIB/mysql-connector-java-5.0.4-bin.jar
     58CP=$CP:$LIB/mysql-connector-java-5.0.6-bin.jar
    5959
    6060# Postgres JDBC driver
  • trunk/www/admin/annotationtypes/list_annotationtypes.jsp

    r3190 r3452  
    325325        sortable="false"
    326326        filterable="true"
    327         exportable="true"
     327        exportable="false"
    328328      />
    329329      <tbl:columndef
  • trunk/www/admin/pluginconfigurations/index.jsp

    r2992 r3452  
    3838  import="net.sf.basedb.core.PermissionDeniedException"
    3939  import="net.sf.basedb.core.ItemAlreadyExistsException"
     40  import="net.sf.basedb.core.query.Hql"
    4041  import="net.sf.basedb.util.RemovableUtil"
    4142  import="net.sf.basedb.util.ShareableUtil"
     
    270271    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    271272    final ItemQuery<PluginConfiguration> query = PluginConfiguration.getQuery();
     273    query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
     274    query.join(Hql.leftJoin(Item.PLUGINDEFINITION.getAlias(), "guiContexts", "ctx", null, false));
     275    query.setDistinct(true);
    272276    cc.configureQuery(query, true);
    273277    cc.setQuery(query);
     
    285289    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    286290    final ItemQuery<PluginConfiguration> query = PluginConfiguration.getQuery();
     291    query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
     292    query.join(Hql.leftJoin(Item.PLUGINDEFINITION.getAlias(), "guiContexts", "ctx", null, false));
     293    query.setDistinct(true);
    287294    cc.configureQuery(query, true);
    288295    cc.setQuery(query);
     
    300307    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    301308    final ItemQuery<PluginConfiguration> query = PluginConfiguration.getQuery();
     309    query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
     310    query.join(Hql.leftJoin(Item.PLUGINDEFINITION.getAlias(), "guiContexts", "ctx", null, false));
     311    query.setDistinct(true);
    302312    cc.configureQuery(query, true);
    303313    cc.setQuery(query);
  • trunk/www/admin/pluginconfigurations/list_configurations.jsp

    r3190 r3452  
    9292try
    9393{
    94   final ItemQuery<PluginConfiguration> query = Base.getConfiguredQuery(cc, false, PluginConfiguration.getQuery(), mode);
    95   query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
    96 
    9794  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
    9895  try
    9996  {
     97    final ItemQuery<PluginConfiguration> query = Base.getConfiguredQuery(cc, true, PluginConfiguration.getQuery(), mode);
     98    query.join(Hql.innerJoin("pluginDefinition", Item.PLUGINDEFINITION.getAlias()));
     99    query.join(Hql.leftJoin(Item.PLUGINDEFINITION.getAlias(), "guiContexts", "ctx", null, false));
     100    query.setDistinct(true);
    100101    configurations = query.iterate(dc);
    101102  }
     
    266267      <tbl:columndef
    267268        id="contexts"
    268         property="pluginDefinition.guiContexts.itemType"
     269        property="$ctx.itemType"
    269270        datatype="int"
    270271        enumeration="<%=itemTypes%>"
     
    272273        sortable="false"
    273274        filterable="true"
    274         exportable="true"
     275        exportable="false"
    275276      />
    276277      <tbl:columndef
  • trunk/www/admin/plugindefinitions/index.jsp

    r2978 r3452  
    4242  import="net.sf.basedb.core.RoleKey"
    4343  import="net.sf.basedb.core.plugin.Plugin"
     44  import="net.sf.basedb.core.query.Hql"
    4445  import="net.sf.basedb.util.RemovableUtil"
    4546  import="net.sf.basedb.util.ShareableUtil"
     
    302303    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    303304    final ItemQuery<PluginDefinition> query = PluginDefinition.getQuery();
     305    query.join(Hql.leftJoin("guiContexts", "ctx"));
     306    query.setDistinct(true);
    304307    cc.configureQuery(query, true);
    305308    cc.setQuery(query);
     
    317320    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    318321    final ItemQuery<PluginDefinition> query = PluginDefinition.getQuery();
     322    query.join(Hql.leftJoin("guiContexts", "ctx"));
     323    query.setDistinct(true);
    319324    cc.configureQuery(query, true);
    320325    cc.setQuery(query);
     
    332337    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
    333338    final ItemQuery<PluginDefinition> query = PluginDefinition.getQuery();
     339    query.join(Hql.leftJoin("guiContexts", "ctx"));
     340    query.setDistinct(true);
    334341    cc.configureQuery(query, true);
    335342    cc.setQuery(query);
  • trunk/www/admin/plugindefinitions/list_plugins.jsp

    r3190 r3452  
    104104  try
    105105  {
    106     final ItemQuery<PluginDefinition> query = Base.getConfiguredQuery(cc, false, PluginDefinition.getQuery(), mode);
     106    final ItemQuery<PluginDefinition> query = Base.getConfiguredQuery(cc, true, PluginDefinition.getQuery(), mode);
     107    query.join(Hql.leftJoin("guiContexts", "ctx"));
     108    query.setDistinct(true);
    107109    plugins = query.iterate(dc);
    108110  }
     
    381383      <tbl:columndef
    382384        id="contexts"
    383         property="guiContexts.itemType"
     385        property="$ctx.itemType"
     386        exportproperty="guiContexts.itemType"
    384387        datatype="int"
    385388        enumeration="<%=itemTypes%>"
     
    387390        sortable="false"
    388391        filterable="true"
    389         exportable="true"
     392        exportable="false"
    390393      />
    391394      <tbl:columndef
Note: See TracChangeset for help on using the changeset viewer.