[jboss-svn-commits] JBL Code SVN: r8411 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/repository test/java/org/drools/repository
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 19 12:07:46 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-19 12:07:39 -0500 (Tue, 19 Dec 2006)
New Revision: 8411
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/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
Log:
modifications to do with format types.
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 2006-12-19 16:51:48 UTC (rev 8410)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java 2006-12-19 17:07:39 UTC (rev 8411)
@@ -38,8 +38,12 @@
* for this package.
*/
public static final String ASSET_FOLDER_NAME = "assets";
-
+
/**
+ * The dublin core format attribute.
+ */
+ public static final String PACKAGE_FORMAT = "package";
+ /**
* The name of the reference property on the rulepackage_node_type type node that objects of
* this type hold a reference to
*/
@@ -93,21 +97,20 @@
* (unless packages are enough for you).
*/
public AssetItem addAsset(String assetName, String description) {
- return addAsset(assetName, description, null);
+ return addAsset(assetName, description, null, null);
}
-
-// public void searchAssets() {
-// this.node.getPath();
-// Query = this.node.getSession().getWorkspace().getQueryManager().createQuery( arg0, arg1 );
-// }
/**
* This adds a rule to the current physical package (you can move it later).
* With the given category
+ * @param assetName The name of the asset (the file name minus the extension)
+ * @param description A description of the asset.
+ * @param initialCategory The initial category the asset is placed in (can belong to multiple ones later).
+ * @param format The dublin core format (which also determines what editor is used) - this is effectively the file extension.
*/
public AssetItem addAsset(String assetName,
- String description, String initialCategory) {
+ String description, String initialCategory, String format) {
Node ruleNode;
try {
@@ -119,8 +122,13 @@
ruleNode.setProperty( AssetItem.DESCRIPTION_PROPERTY_NAME,
description );
- ruleNode.setProperty( AssetItem.FORMAT_PROPERTY_NAME,
- AssetItem.RULE_FORMAT );
+ if (format != null) {
+ ruleNode.setProperty( AssetItem.FORMAT_PROPERTY_NAME,
+ format );
+ } else {
+ ruleNode.setProperty( AssetItem.FORMAT_PROPERTY_NAME,
+ AssetItem.DEFAULT_CONTENT_FORMAT );
+ }
ruleNode.setProperty( VersionableItem.CHECKIN_COMMENT,
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 2006-12-19 16:51:48 UTC (rev 8410)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2006-12-19 17:07:39 UTC (rev 8411)
@@ -487,7 +487,7 @@
rulePackageNode.setProperty(AssetItem.DESCRIPTION_PROPERTY_NAME, description);
- rulePackageNode.setProperty(AssetItem.FORMAT_PROPERTY_NAME, AssetItem.RULE_PACKAGE_FORMAT);
+ rulePackageNode.setProperty(AssetItem.FORMAT_PROPERTY_NAME, PackageItem.PACKAGE_FORMAT);
Calendar lastModified = Calendar.getInstance();
rulePackageNode.setProperty(PackageItem.LAST_MODIFIED_PROPERTY_NAME, lastModified);
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java 2006-12-19 16:51:48 UTC (rev 8410)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java 2006-12-19 17:07:39 UTC (rev 8411)
@@ -59,10 +59,7 @@
/**
* The possible formats for the format property of the node
*/
- public static final String RULE_FORMAT = "DRL";
- public static final String DSL_FORMAT = "DSL";
- public static final String RULE_PACKAGE_FORMAT = "Rule Package";
- public static final String FUNCTION_FORMAT = "Function";
+ public static final String DEFAULT_CONTENT_FORMAT = "txt";
/** this is what is referred to when reading content from a versioned node */
private Node contentNode = null;
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2006-12-19 16:51:48 UTC (rev 8410)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2006-12-19 17:07:39 UTC (rev 8411)
@@ -138,10 +138,13 @@
public void testFindRulesByCategory() throws Exception {
getRepo().loadCategory( "/" ).addCategory( "testFindRulesByCat", "yeah" );
- getDefaultPackage().addAsset( "testFindRulesByCategory1", "ya", "testFindRulesByCat" ).checkin( "version0" );
- getDefaultPackage().addAsset( "testFindRulesByCategory2", "ya", "testFindRulesByCat" ).checkin( "version0" );
+ AssetItem as1 = getDefaultPackage().addAsset( "testFindRulesByCategory1", "ya", "testFindRulesByCat", "drl" );
+ getDefaultPackage().addAsset( "testFindRulesByCategory2", "ya", "testFindRulesByCat", AssetItem.DEFAULT_CONTENT_FORMAT ).checkin( "version0" );
+ as1.checkin( "version0" );
+ assertEquals("drl", as1.getFormat());
+
List rules = getRepo().findAssetsByCategory( "testFindRulesByCat" );
assertEquals(2, rules.size());
@@ -521,7 +524,7 @@
public void testGetFormat() {
AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetFormat", "test content");
- assertEquals("DRL", ruleItem1.getFormat());
+ assertEquals(AssetItem.DEFAULT_CONTENT_FORMAT, ruleItem1.getFormat());
ruleItem1.updateFormat( "blah" );
assertEquals("blah", ruleItem1.getFormat());
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2006-12-19 16:51:48 UTC (rev 8410)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2006-12-19 17:07:39 UTC (rev 8411)
@@ -133,6 +133,7 @@
assertEquals("testLoadRuleRuleItem", rulePackageItem.getName());
assertEquals("desc", rulePackageItem.getDescription());
+ assertEquals(PackageItem.PACKAGE_FORMAT, rulePackageItem.getFormat());
// try loading rule package that was not created
try {
rulePackageItem = getRepo().loadPackage("anotherRuleRuleItem");
@@ -433,7 +434,7 @@
public void testGetFormat() {
PackageItem rulePackageItem1 = getRepo().createPackage("testGetFormat", "woot");
assertNotNull(rulePackageItem1);
- assertEquals("Rule Package", rulePackageItem1.getFormat());
+ assertEquals(PackageItem.PACKAGE_FORMAT, rulePackageItem1.getFormat());
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list