[jboss-svn-commits] JBL Code SVN: r20169 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server: builder and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 26 15:24:27 EDT 2008
Author: arhan
Date: 2008-05-26 15:24:27 -0400 (Mon, 26 May 2008)
New Revision: 20169
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java
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/files/FileManagerUtils.java
Log:
getHandler method is moved from ContentHandler to ContentManager in order to avoid cyclic dependency
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-05-26 17:34:07 UTC (rev 20168)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-05-26 19:24:27 UTC (rev 20169)
@@ -16,100 +16,54 @@
*/
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.jcr.ItemExistsException;
-import javax.jcr.RepositoryException;
-
+import com.google.gwt.user.client.rpc.SerializableException;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
-import org.drools.util.DroolsStreamUtils;
import org.drools.base.ClassTypeResolver;
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.rpc.AnalysisReport;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.client.rpc.BulkTestRunResult;
-import org.drools.brms.client.rpc.DetailedSerializableException;
-import org.drools.brms.client.rpc.LogEntry;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryService;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.ScenarioResultSummary;
-import org.drools.brms.client.rpc.ScenarioRunResult;
-import org.drools.brms.client.rpc.SnapshotInfo;
-import org.drools.brms.client.rpc.TableConfig;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
-import org.drools.brms.client.rpc.ValidatedResponse;
+import org.drools.brms.client.rpc.*;
import org.drools.brms.server.builder.BRMSPackageBuilder;
import org.drools.brms.server.builder.ContentAssemblyError;
import org.drools.brms.server.builder.ContentPackageAssembler;
-import org.drools.brms.server.contenthandler.ContentHandler;
-import org.drools.brms.server.contenthandler.IRuleAsset;
-import org.drools.brms.server.contenthandler.IValidating;
-import org.drools.brms.server.contenthandler.ModelContentHandler;
-import org.drools.brms.server.util.AnalysisRunner;
-import org.drools.brms.server.util.BRMSSuggestionCompletionLoader;
-import org.drools.brms.server.util.LoggingHelper;
-import org.drools.brms.server.util.MetaDataMapper;
-import org.drools.brms.server.util.TableDisplayHandler;
+import org.drools.brms.server.contenthandler.*;
+import org.drools.brms.server.util.*;
import org.drools.common.AbstractRuleBase;
-import org.drools.common.InternalWorkingMemory;
import org.drools.common.DroolsObjectOutputStream;
+import org.drools.common.InternalWorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.RuleDescr;
-import org.drools.repository.AssetHistoryIterator;
-import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
-import org.drools.repository.CategoryItem;
-import org.drools.repository.AssetPageList;
-import org.drools.repository.PackageItem;
-import org.drools.repository.PackageIterator;
-import org.drools.repository.RulesRepository;
-import org.drools.repository.RulesRepositoryAdministrator;
-import org.drools.repository.RulesRepositoryException;
-import org.drools.repository.StateItem;
-import org.drools.repository.VersionableItem;
+import org.drools.repository.*;
import org.drools.rule.Package;
import org.drools.testframework.RuleCoverageListener;
import org.drools.testframework.ScenarioRunner;
+import org.drools.util.DroolsStreamUtils;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.remoting.WebRemote;
import org.jboss.seam.annotations.security.Restrict;
-import com.google.gwt.user.client.rpc.SerializableException;
+import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.text.DateFormat;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* This is the implementation of the repository service to drive the GWT based front end.
@@ -344,7 +298,7 @@
PackageItem pkgItem = repository.loadPackage( asset.metaData.packageName );
//load the content
- ContentHandler handler = ContentHandler.getHandler( asset.metaData.format );
+ ContentHandler handler = ContentManager.getHandler( asset.metaData.format );
handler.retrieveAssetContent(asset, pkgItem, item);
return asset;
@@ -359,7 +313,7 @@
// get package header
PackageItem pkgItem = repository.loadPackage( asset.metaData.packageName );
//load the content
- ContentHandler handler = ContentHandler.getHandler( asset.metaData.format );
+ ContentHandler handler = ContentManager.getHandler( asset.metaData.format );
handler.retrieveAssetContent(asset, pkgItem, item);
return asset;
}
@@ -436,7 +390,7 @@
repoAsset.updateCategoryList( meta.categories );
- ContentHandler handler = ContentHandler.getHandler( repoAsset.getFormat() );//new AssetContentFormatHandler();
+ ContentHandler handler = ContentManager.getHandler( repoAsset.getFormat() );//new AssetContentFormatHandler();
handler.storeAssetContent( asset, repoAsset );
if (!(asset.metaData.format.equals(AssetFormats.TEST_SCENARIO))
@@ -950,7 +904,7 @@
public String buildAssetSource(RuleAsset asset) throws SerializableException {
AssetItem item = repository.loadAssetByUUID( asset.uuid );
- ContentHandler handler = ContentHandler.getHandler( item.getFormat() );//new AssetContentFormatHandler();
+ ContentHandler handler = ContentManager.getHandler( item.getFormat() );//new AssetContentFormatHandler();
handler.storeAssetContent( asset, item );
StringBuffer buf = new StringBuffer();
if (handler.isRuleAsset()) {
@@ -978,7 +932,7 @@
AssetItem item = repository.loadAssetByUUID( asset.uuid );
- ContentHandler handler = ContentHandler.getHandler( item.getFormat() );//new AssetContentFormatHandler();
+ ContentHandler handler = ContentManager.getHandler( item.getFormat() );//new AssetContentFormatHandler();
handler.storeAssetContent( asset, item );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java 2008-05-26 17:34:07 UTC (rev 20168)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java 2008-05-26 19:24:27 UTC (rev 20169)
@@ -16,29 +16,25 @@
*/
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.jar.JarInputStream;
-
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.server.contenthandler.ContentHandler;
+import org.drools.brms.server.contenthandler.ContentManager;
import org.drools.brms.server.contenthandler.IRuleAsset;
import org.drools.brms.server.selector.AssetSelector;
import org.drools.brms.server.selector.SelectorManager;
import org.drools.compiler.DroolsError;
import org.drools.compiler.DroolsParserException;
import org.drools.lang.descr.PackageDescr;
-import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
-import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
-import org.drools.repository.VersionableItem;
+import org.drools.repository.*;
import org.drools.rule.Package;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.JarInputStream;
+
/**
* This assembles packages in the BRMS into binary package objects, and deals with errors etc.
* Each content type is responsible for contributing to the package.
@@ -133,7 +129,7 @@
* Builds assets that are "rule" assets (ie things that are not functions etc).
*/
private void buildAsset(AssetItem asset) {
- ContentHandler h = ContentHandler.getHandler( asset.getFormat() );
+ ContentHandler h = ContentManager.getHandler( asset.getFormat() );
if (h instanceof IRuleAsset) {
try {
((IRuleAsset) h).compile( builder, asset, new ErrorLogger() );
@@ -292,7 +288,7 @@
while (iter.hasNext()) {
AssetItem asset = (AssetItem) iter.next();
if (!asset.isArchived()) {
- ContentHandler h = ContentHandler.getHandler( asset.getFormat() );
+ ContentHandler h = ContentManager.getHandler( asset.getFormat() );
if (h instanceof IRuleAsset) {
IRuleAsset ruleAsset = (IRuleAsset) h;
ruleAsset.assembleDRL( builder, asset, src );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java 2008-05-26 17:34:07 UTC (rev 20168)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java 2008-05-26 19:24:27 UTC (rev 20169)
@@ -32,12 +32,6 @@
*/
public abstract class ContentHandler {
- static Map handlers;
-
- static {
- handlers = ContentManager.getInstance().getContentHandlers();
- }
-
/**
* When loading asset content.
* @param asset The target.
@@ -57,13 +51,6 @@
public abstract void storeAssetContent(RuleAsset asset,
AssetItem repoAsset) throws SerializableException;
-
- public static ContentHandler getHandler(String format) {
- ContentHandler h = (ContentHandler) handlers.get( format );
- if (h == null) throw new IllegalArgumentException("Unable to handle the content type: " + format);
- return h;
- }
-
/**
* @return true if the current content type is for a rule asset.
* If it is a rule asset, then it can be assembled into a package.
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 2008-05-26 17:34:07 UTC (rev 20168)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java 2008-05-26 19:24:27 UTC (rev 20169)
@@ -97,4 +97,10 @@
}
return INSTANCE;
}
+
+ public static ContentHandler getHandler(String format) {
+ ContentHandler h = ContentManager.getInstance().getContentHandlers().get( format );
+ if (h == null) throw new IllegalArgumentException("Unable to handle the content type: " + format);
+ return h;
+ }
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java 2008-05-26 17:34:07 UTC (rev 20168)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java 2008-05-26 19:24:27 UTC (rev 20169)
@@ -16,17 +16,6 @@
*/
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.FileUploadException;
@@ -35,10 +24,11 @@
import org.drools.brms.client.common.HTMLFileManagerFields;
import org.drools.brms.server.builder.ContentPackageAssembler;
import org.drools.brms.server.contenthandler.ContentHandler;
+import org.drools.brms.server.contenthandler.ContentManager;
import org.drools.brms.server.contenthandler.ModelContentHandler;
import org.drools.brms.server.util.ClassicDRLImporter;
-import org.drools.brms.server.util.FormData;
import org.drools.brms.server.util.ClassicDRLImporter.Asset;
+import org.drools.brms.server.util.FormData;
import org.drools.compiler.DroolsParserException;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
@@ -51,6 +41,15 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.List;
+
/**
* This assists the file manager servlets.
* @author Fernando Meyer
@@ -96,7 +95,7 @@
//special treatment for model attachments.
- ContentHandler handler = ContentHandler.getHandler(item.getFormat());
+ ContentHandler handler = ContentManager.getHandler(item.getFormat());
if (handler instanceof ModelContentHandler) {
((ModelContentHandler)handler).modelAttached(item);
}
More information about the jboss-svn-commits
mailing list