[jboss-svn-commits] JBL Code SVN: r10062 - in labs/jbossrules/trunk/drools-repository/src/main: resources/node_type_definitions and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2007-03-08 06:54:13 -0500 (Thu, 08 Mar 2007)
New Revision: 10062

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rule_node_type.cnd
   labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd
Log:
JBRULES-730

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2007-03-08 11:43:37 UTC (rev 10061)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2007-03-08 11:54:13 UTC (rev 10062)
@@ -22,7 +22,7 @@
     /**
      * The name of the rule node type
      */
-    public static final String RULE_NODE_TYPE_NAME          = "drools:ruleNodeType";
+    public static final String RULE_NODE_TYPE_NAME          = "drools:assetNodeType";
 
     public static final String CONTENT_PROPERTY_NAME        = "drools:content";
     public static final String CONTENT_PROPERTY_BINARY_NAME = "drools:binaryContent";

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-03-08 11:43:37 UTC (rev 10061)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-03-08 11:54:13 UTC (rev 10062)
@@ -42,7 +42,7 @@
     /**
      * The name of the rule package node type
      */
-    public static final String RULE_PACKAGE_TYPE_NAME           = "drools:rulepackageNodeType";
+    public static final String RULE_PACKAGE_TYPE_NAME           = "drools:packageNodeType";
 
     
     public static final String HEADER_PROPERTY_NAME             = "drools:header";
@@ -351,8 +351,7 @@
      */
     public AssetItemIterator queryAssets(String fieldPredicates) {
         try {
-            
-            //String sql = "SELECT * FROM drools:ruleNodeType WHERE jcr:path LIKE '/drools:repository/drools:rulepackage_area/searchByFormat/rules[%]/%'";
+
             String sql = "SELECT * FROM " + AssetItem.RULE_NODE_TYPE_NAME;
             sql += " WHERE jcr:path LIKE '" + getVersionContentNode().getPath() + "/" + ASSET_FOLDER_NAME + "[%]/%'";
             

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-03-08 11:43:37 UTC (rev 10061)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-03-08 11:54:13 UTC (rev 10062)
@@ -69,7 +69,7 @@
     /**
      * The name of the rulepackage area of the repository
      */
-    public final static String RULE_PACKAGE_AREA = "drools:rulepackage_area";
+    public final static String RULE_PACKAGE_AREA = "drools:package_area";
     
     /**
      * The name of the rulepackage area of the repository

Modified: labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rule_node_type.cnd
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rule_node_type.cnd	2007-03-08 11:43:37 UTC (rev 10061)
+++ labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rule_node_type.cnd	2007-03-08 11:54:13 UTC (rev 10062)
@@ -8,7 +8,7 @@
 <mix='http://www.jcp.org/jcr/mix/1.0'>
 
 // Node type name
-[drools:ruleNodeType]
+[drools:assetNodeType]
 
 // Supertypes
 > 'drools:versionableNodeType'

Modified: labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd	2007-03-08 11:43:37 UTC (rev 10061)
+++ labs/jbossrules/trunk/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd	2007-03-08 11:54:13 UTC (rev 10062)
@@ -8,7 +8,7 @@
 <mix='http://www.jcp.org/jcr/mix/1.0'>
 
 // Node type name
-[drools:rulepackageNodeType]
+[drools:packageNodeType]
 
 // Supertypes
 > 'drools:versionableNodeType', 'nt:folder'
@@ -30,6 +30,6 @@
 - drools:ruleReference (reference)
   multiple
   copy
-  < 'drools:ruleNodeType','nt:version'
+  < 'drools:assetNodeType','nt:version'
 */