[jboss-svn-commits] JBL Code SVN: r16975 - in labs/jbossrules/trunk/drools-jbrms/src: main/resources and 1 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-12-02 20:39:08 -0500 (Sun, 02 Dec 2007)
New Revision: 16975

Added:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java
Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java
   labs/jbossrules/trunk/drools-jbrms/src/main/resources/contenthandler.properties
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java
Log:
JBRULES-1271 content handler integration

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java	2007-12-03 00:05:24 UTC (rev 16974)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java	2007-12-03 01:39:08 UTC (rev 16975)
@@ -32,7 +32,7 @@
 
 	private static final Logger log = Logger.getLogger( ContentManager.class );
 	public static String CONTENT_CONFIG_PROPERTIES = "/contenthandler.properties";
-	private static final ContentManager INSTANCE = new ContentManager(CONTENT_CONFIG_PROPERTIES);
+	private static ContentManager INSTANCE;
 
     /**
      * This is a map of the contentHandlers to use.
@@ -87,6 +87,14 @@
 
 
 	public static ContentManager getInstance() {
+		if (INSTANCE == null) {
+			//have to do this annoying thing, as in some cases, letting the classloader
+			//load it up means that it will fail as the classes aren't yet available.
+			//so have to use this nasty anti-pattern here. Sorry.
+			synchronized (ContentManager.class) {
+				ContentManager.INSTANCE = new ContentManager(CONTENT_CONFIG_PROPERTIES);
+			}
+		}
 		return INSTANCE;
 	}
 }

Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java	2007-12-03 01:39:08 UTC (rev 16975)
@@ -0,0 +1,5 @@
+package org.drools.brms.server.contenthandler;
+
+public class ScenarioContentHandler extends PlainTextContentHandler {
+
+}


Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/resources/contenthandler.properties
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/resources/contenthandler.properties	2007-12-03 00:05:24 UTC (rev 16974)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/resources/contenthandler.properties	2007-12-03 01:39:08 UTC (rev 16975)
@@ -20,3 +20,5 @@
 rf=org.drools.brms.server.contenthandler.RuleFlowHandler
 # Content Handler for Enumeration
 enumeration=org.drools.brms.server.contenthandler.EnumerationContentHandler
+# Content handler for scenario (its just text, not part of build)
+scenario=org.drools.brms.server.contenthandler.ScenarioContentHandler
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java	2007-12-03 00:05:24 UTC (rev 16974)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java	2007-12-03 01:39:08 UTC (rev 16975)
@@ -1,5 +1,7 @@
 package org.drools.brms.server.contenthandler;
 
+import org.drools.brms.client.common.AssetFormats;
+
 import junit.framework.TestCase;
 
 public class ContentManagerTest extends TestCase {
@@ -9,9 +11,12 @@
 		ContentManager mgr_ = ContentManager.getInstance();
 		assertSame(mgr, mgr_);
 
-		assertEquals(9, mgr.getContentHandlers().size());
+		assertEquals(10, mgr.getContentHandlers().size());
 		assertTrue(mgr.getContentHandlers().get("drl") instanceof DRLFileContentHandler);
 
+		assertTrue(mgr.getContentHandlers().containsKey(AssetFormats.TEST_SCENARIO));
+		assertTrue(mgr.getContentHandlers().get(AssetFormats.TEST_SCENARIO) instanceof ScenarioContentHandler);
+
 	}
 
 }