[jbpm-commits] JBoss JBPM SVN: r5661 - in jbpm4/trunk/modules: distro/src/main/files/install and 3 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-09-18 11:39:33 -0400 (Fri, 18 Sep 2009)
New Revision: 5661

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/logging/none/
Removed:
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/logging/provided/
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/test-db/pom.xml
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java
Log:
JBPM-2548 deprecated the name property in the DeploymentQuery

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java	2009-09-18 09:08:54 UTC (rev 5660)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java	2009-09-18 15:39:33 UTC (rev 5661)
@@ -29,6 +29,9 @@
  */
 public interface DeploymentQuery {
   
+  /** sorting by name does not work on oracle.  that's why it is deprecated.
+   * will be removed in jBPM 4.3 */
+  @Deprecated
   String PROPERTY_NAME = "name";
   String PROPERTY_TIMESTAMP = "timestamp";
   String PROPERTY_STATE = "state";

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-09-18 09:08:54 UTC (rev 5660)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-09-18 15:39:33 UTC (rev 5661)
@@ -18,7 +18,7 @@
   <property name="jbpm.parent.dir" value="../.." />
   <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
   <property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
-  <property name="logging" value="jdk" /> <!-- jdk | provided -->
+  <property name="logging" value="jdk" /> <!-- jdk | none -->
   <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" />
   <property name="install.src.dir" value="${jbpm.home}/install/src" />
   <property name="mail.cfg" value="default" />

Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/logging/none (from rev 5660, jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/logging/provided)

Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml	2009-09-18 09:08:54 UTC (rev 5660)
+++ jbpm4/trunk/modules/test-db/pom.xml	2009-09-18 15:39:33 UTC (rev 5661)
@@ -123,6 +123,7 @@
                       <property name="cfg.dest.dir" value="target/test-classes" />
                       <property name="install.src.dir" value="../distro/src/main/files/install/src" />
                       <property name="jdbc.properties.dir" value="target/jdbc.properties" />
+                      <property name="logging" value="none" /> <!-- then the original logging.properties in the resources of this project will be used -->
                     </ant> 
                   </tasks>
                 </configuration>

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java	2009-09-18 09:08:54 UTC (rev 5660)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java	2009-09-18 15:39:33 UTC (rev 5661)
@@ -147,10 +147,6 @@
     }
   }
   
-  public void testOrderByName() {
-    testOrderBy(DeploymentQuery.PROPERTY_NAME, Arrays.asList("Claim", "Fire", "Hire"));
-  }
-  
   public void testOrderByTimeStamp() {
     testOrderByNaturalOrdening(DeploymentQuery.PROPERTY_TIMESTAMP, 3);
   }