[jboss-svn-commits] JBL Code SVN: r34982 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/compiler/xml and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Sep 2 17:52:23 EDT 2010


Author: KrisVerlaenen
Date: 2010-09-02 17:52:21 -0400 (Thu, 02 Sep 2010)
New Revision: 34982

Added:
   labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/
   labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/compiler/
   labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/compiler/Activator.java
Removed:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessBuildData.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessSemanticModule.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlProcessReader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlRuleFlowProcessDumper.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlWorkflowProcessDumper.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/StoreHandler.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/TestXml.java
Log:
JBRULES-2679: Mdularize Drools Flow
 - separating out drools-flow-compiler

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessBuildData.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessBuildData.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessBuildData.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,44 +0,0 @@
-/**
- * 
- */
-package org.drools.compiler.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.drools.definition.process.Process;
-import org.drools.workflow.core.Node;
-
-public class ProcessBuildData {
-    
-    private Process process;
-    private Map<Long, Node> nodes = new HashMap<Long, Node>();
-    private Map<String, Object> metaData = new HashMap<String, Object>();
-    
-    public Process getProcess() {
-        return process;
-    }
-    
-    public void setProcess(Process process) {
-        this.process = process;
-    }
-    
-    public Map<Long, Node> getNodes() {
-        return nodes;
-    }
-    public boolean addNode(Node node) {
-        return( this.nodes.put( node.getId(), node ) != null );
-    }               
-    
-    public Node getNode(Long id) {
-        return this.nodes.get( id );
-    }
-    
-    public Object getMetaData(String name) {
-        return metaData.get(name);
-    }
-    
-    public void setMetaData(String name, Object data) {
-        this.metaData.put(name, data);
-    }
-}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessSemanticModule.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessSemanticModule.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/ProcessSemanticModule.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,122 +0,0 @@
-package org.drools.compiler.xml;
-
-import org.drools.compiler.xml.processes.ActionNodeHandler;
-import org.drools.compiler.xml.processes.CompositeNodeHandler;
-import org.drools.compiler.xml.processes.ConnectionHandler;
-import org.drools.compiler.xml.processes.ConstraintHandler;
-import org.drools.compiler.xml.processes.DynamicNodeHandler;
-import org.drools.compiler.xml.processes.EndNodeHandler;
-import org.drools.compiler.xml.processes.EventFilterHandler;
-import org.drools.compiler.xml.processes.EventNodeHandler;
-import org.drools.compiler.xml.processes.ExceptionHandlerHandler;
-import org.drools.compiler.xml.processes.FaultNodeHandler;
-import org.drools.compiler.xml.processes.ForEachNodeHandler;
-import org.drools.compiler.xml.processes.FunctionImportHandler;
-import org.drools.compiler.xml.processes.GlobalHandler;
-import org.drools.compiler.xml.processes.HumanTaskNodeHandler;
-import org.drools.compiler.xml.processes.ImportHandler;
-import org.drools.compiler.xml.processes.InPortHandler;
-import org.drools.compiler.xml.processes.JoinNodeHandler;
-import org.drools.compiler.xml.processes.MappingHandler;
-import org.drools.compiler.xml.processes.MetaDataHandler;
-import org.drools.compiler.xml.processes.MilestoneNodeHandler;
-import org.drools.compiler.xml.processes.OutPortHandler;
-import org.drools.compiler.xml.processes.ParameterHandler;
-import org.drools.compiler.xml.processes.ProcessHandler;
-import org.drools.compiler.xml.processes.RuleSetNodeHandler;
-import org.drools.compiler.xml.processes.SplitNodeHandler;
-import org.drools.compiler.xml.processes.StartNodeHandler;
-import org.drools.compiler.xml.processes.StateNodeHandler;
-import org.drools.compiler.xml.processes.SubProcessNodeHandler;
-import org.drools.compiler.xml.processes.SwimlaneHandler;
-import org.drools.compiler.xml.processes.TimerHandler;
-import org.drools.compiler.xml.processes.TimerNodeHandler;
-import org.drools.compiler.xml.processes.TriggerHandler;
-import org.drools.compiler.xml.processes.TypeHandler;
-import org.drools.compiler.xml.processes.ValueHandler;
-import org.drools.compiler.xml.processes.VariableHandler;
-import org.drools.compiler.xml.processes.WorkHandler;
-import org.drools.compiler.xml.processes.WorkItemNodeHandler;
-import org.drools.xml.DefaultSemanticModule;
-import org.drools.xml.SemanticModule;
-
-public class ProcessSemanticModule extends DefaultSemanticModule implements SemanticModule {    
-    public ProcessSemanticModule() {
-        super ( "http://drools.org/drools-5.0/process" );
-
-        addHandler( "process",
-                           new ProcessHandler() );
-        addHandler( "start",
-                           new StartNodeHandler() );
-        addHandler( "end",
-                           new EndNodeHandler() );
-        addHandler( "actionNode",
-                           new ActionNodeHandler() );
-        addHandler( "ruleSet",
-                           new RuleSetNodeHandler() );
-        addHandler( "subProcess",
-                           new SubProcessNodeHandler() );
-        addHandler( "workItem",
-                           new WorkItemNodeHandler() );
-        addHandler( "split",
-                           new SplitNodeHandler() );
-        addHandler( "join",
-                           new JoinNodeHandler() );
-        addHandler( "milestone",
-                           new MilestoneNodeHandler() );
-        addHandler( "timerNode",
-                           new TimerNodeHandler() );
-        addHandler( "humanTask",
-                           new HumanTaskNodeHandler() );
-        addHandler( "forEach",
-                           new ForEachNodeHandler() );
-        addHandler( "composite",
-                           new CompositeNodeHandler() );
-        addHandler( "connection",
-                           new ConnectionHandler() );
-        addHandler( "import",
-                           new ImportHandler() );
-        addHandler( "functionImport",
-                           new FunctionImportHandler() );
-        addHandler( "global",
-                           new GlobalHandler() );        
-        addHandler( "variable",
-                           new VariableHandler() );        
-        addHandler( "swimlane",
-                           new SwimlaneHandler() );        
-        addHandler( "type",
-                           new TypeHandler() );        
-        addHandler( "value",
-                           new ValueHandler() );        
-        addHandler( "work",
-                           new WorkHandler() );        
-        addHandler( "parameter",
-                           new ParameterHandler() );        
-        addHandler( "mapping",
-                           new MappingHandler() );        
-        addHandler( "constraint",
-                           new ConstraintHandler() );        
-        addHandler( "in-port",
-                           new InPortHandler() );        
-        addHandler( "out-port",
-                           new OutPortHandler() );        
-        addHandler( "eventNode",
-                		   new EventNodeHandler() );        
-        addHandler( "eventFilter",
-                		   new EventFilterHandler() );        
-        addHandler( "fault",
-     		   			   new FaultNodeHandler() );        
-        addHandler( "exceptionHandler",
-	   			   		   new ExceptionHandlerHandler() );        
-        addHandler( "timer",
-                		   new TimerHandler() );
-        addHandler( "trigger",
-     		               new TriggerHandler() );
-        addHandler( "state",
-     		               new StateNodeHandler() );        
-        addHandler( "dynamic",
- 		                   new DynamicNodeHandler() );        
-        addHandler( "metaData",
-                           new MetaDataHandler() );        
-    }
-}

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlProcessReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlProcessReader.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlProcessReader.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,83 +0,0 @@
-package org.drools.compiler.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.parsers.SAXParser;
-
-import org.drools.definition.process.Process;
-import org.drools.xml.ExtensibleXmlParser;
-import org.drools.xml.SemanticModules;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class XmlProcessReader {
-    private ExtensibleXmlParser parser;
-
-    private Process        process;
-
-    public XmlProcessReader(final SemanticModules modules) {
-        this( modules, null );
-    }
-
-    public XmlProcessReader(final SemanticModules modules, final SAXParser parser) {
-        if ( parser == null ) {
-            this.parser = new ExtensibleXmlParser();
-        } else {
-            this.parser = new ExtensibleXmlParser( parser );
-        }      
-        this.parser.setSemanticModules( modules );
-        this.parser.setData( new ProcessBuildData() );
-    }
-
-    /**
-     * Read a <code>Process</code> from a <code>Reader</code>.
-     *
-     * @param reader
-     *            The reader containing the rule-set.
-     *
-     * @return The rule-set.
-     */
-    public Process read(final Reader reader) throws SAXException,
-                                                 IOException {
-        this.process = ((ProcessBuildData) this.parser.read( reader )).getProcess();
-        return this.process;
-    }
-
-    /**
-     * Read a <code>Process</code> from an <code>InputStream</code>.
-     *
-     * @param inputStream
-     *            The input-stream containing the rule-set.
-     *
-     * @return The rule-set.
-     */
-    public Process read(final InputStream inputStream) throws SAXException,
-                                                           IOException {
-        this.process = ((ProcessBuildData) this.parser.read( inputStream )).getProcess();
-        return this.process;
-    }
-
-    /**
-     * Read a <code>Process</code> from an <code>InputSource</code>.
-     *
-     * @param in
-     *            The rule-set input-source.
-     *
-     * @return The rule-set.
-     */
-    public Process read(final InputSource in) throws SAXException,
-                                                  IOException {
-        this.process = ((ProcessBuildData)this.parser.read( in )).getProcess();
-        return this.process;
-    }
-
-    void setProcess(final Process process) {
-        this.process = process;
-    }
-
-    public Process getProcess() {
-        return this.process;
-    }
-}

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlRuleFlowProcessDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlRuleFlowProcessDumper.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlRuleFlowProcessDumper.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,16 +0,0 @@
-package org.drools.compiler.xml;
-
-public class XmlRuleFlowProcessDumper extends XmlWorkflowProcessDumper {
-    
-    public static final XmlRuleFlowProcessDumper INSTANCE = new XmlRuleFlowProcessDumper();
-    
-    private XmlRuleFlowProcessDumper() {
-        super(
-            "RuleFlow", 
-            "http://drools.org/drools-5.0/process",
-            "drools-processes-5.0.xsd", 
-            new ProcessSemanticModule()
-        );
-    }
-    
-}

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlWorkflowProcessDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlWorkflowProcessDumper.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/XmlWorkflowProcessDumper.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,257 +0,0 @@
-package org.drools.compiler.xml;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.drools.compiler.xml.processes.AbstractNodeHandler;
-import org.drools.definition.process.Connection;
-import org.drools.definition.process.Node;
-import org.drools.definition.process.WorkflowProcess;
-import org.drools.process.core.context.exception.ActionExceptionHandler;
-import org.drools.process.core.context.exception.ExceptionHandler;
-import org.drools.process.core.context.exception.ExceptionScope;
-import org.drools.process.core.context.swimlane.Swimlane;
-import org.drools.process.core.context.swimlane.SwimlaneContext;
-import org.drools.process.core.context.variable.Variable;
-import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.core.datatype.DataType;
-import org.drools.process.core.datatype.impl.type.ObjectDataType;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.impl.NodeImpl;
-import org.drools.xml.Handler;
-import org.drools.xml.SemanticModule;
-
-public class XmlWorkflowProcessDumper {
-    
-    private final static String EOL = System.getProperty( "line.separator" );
-    
-    private String type;
-    private String namespace;
-    private String schemaLocation;
-    private SemanticModule semanticModule;
-    
-    public XmlWorkflowProcessDumper(String type, String namespace, String schemaLocation, SemanticModule semanticModule) {
-        this.type = type;
-        this.namespace = namespace;
-        this.schemaLocation = schemaLocation;
-        this.semanticModule = semanticModule;
-    }
-    
-    public String dump(WorkflowProcess process) {
-        return dump(process, true);
-    }
-    
-    public String dump(WorkflowProcess process, boolean includeMeta) {
-        StringBuilder xmlDump = new StringBuilder();
-        visitProcess(process, xmlDump, includeMeta);
-        return xmlDump.toString();
-    }
-    
-    protected void visitProcess(WorkflowProcess process, StringBuilder xmlDump, boolean includeMeta) {
-        xmlDump.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?> " + EOL
-            + "<process xmlns=\"" + namespace + "\"" + EOL
-            + "         xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"" + EOL
-            + "         xs:schemaLocation=\"" + namespace + " " + schemaLocation + "\"" + EOL
-            + "         type=\"" + type + "\" ");
-        if (process.getName() != null) {
-            xmlDump.append("name=\"" + process.getName() + "\" ");
-        }
-        if (process.getId() != null) {
-            xmlDump.append("id=\"" + process.getId() + "\" ");
-        }
-        if (process.getPackageName() != null) {
-            xmlDump.append("package-name=\"" + process.getPackageName() + "\" ");
-        }
-        if (process.getVersion() != null) {
-            xmlDump.append("version=\"" + process.getVersion() + "\" ");
-        }
-        if (includeMeta) {
-            Integer routerLayout = (Integer) process.getMetaData("routerLayout");
-            if (routerLayout != null && routerLayout != 0) {
-                xmlDump.append("routerLayout=\"" + routerLayout + "\" ");
-            }
-        }
-        xmlDump.append(">" + EOL + EOL);
-        visitHeader(process, xmlDump, includeMeta);
-        visitNodes(process, xmlDump, includeMeta);
-        visitConnections(process.getNodes(), xmlDump, includeMeta);
-        xmlDump.append("</process>");
-    }
-    
-    protected void visitHeader(WorkflowProcess process, StringBuilder xmlDump, boolean includeMeta) {
-        xmlDump.append("  <header>" + EOL);
-        visitImports(((org.drools.process.core.Process) process).getImports(), xmlDump);
-        visitGlobals(((org.drools.process.core.Process) process).getGlobals(), xmlDump);
-        visitFunctionImports(((org.drools.process.core.Process) process).getFunctionImports(), xmlDump);
-        VariableScope variableScope = (VariableScope)
-        	((org.drools.process.core.Process) process).getDefaultContext(VariableScope.VARIABLE_SCOPE);
-        if (variableScope != null) {
-            visitVariables(variableScope.getVariables(), xmlDump);
-        }
-        SwimlaneContext swimlaneContext = (SwimlaneContext)
-        	((org.drools.process.core.Process) process).getDefaultContext(SwimlaneContext.SWIMLANE_SCOPE);
-        if (swimlaneContext != null) {
-            visitSwimlanes(swimlaneContext.getSwimlanes(), xmlDump);
-        }
-        ExceptionScope exceptionScope = (ExceptionScope)
-        	((org.drools.process.core.Process) process).getDefaultContext(ExceptionScope.EXCEPTION_SCOPE);
-        if (exceptionScope != null) {
-            visitExceptionHandlers(exceptionScope.getExceptionHandlers(), xmlDump);
-        }
-        xmlDump.append("  </header>" + EOL + EOL);
-    }
-    
-    private void visitImports(List<String> imports, StringBuilder xmlDump) {
-        if (imports != null && imports.size() > 0) {
-            xmlDump.append("    <imports>" + EOL);
-            for (String importString: imports) {
-                xmlDump.append("      <import name=\"" + importString + "\" />" + EOL);
-            }
-            xmlDump.append("    </imports>" + EOL);
-        }
-    }
-    
-    private void visitFunctionImports(List<String> imports, StringBuilder xmlDump) {
-        if (imports != null && imports.size() > 0) {
-            xmlDump.append("    <functionImports>" + EOL);
-            for (String importString: imports) {
-                xmlDump.append("      <functionImport name=\"" + importString + "\" />" + EOL);
-            }
-            xmlDump.append("    </functionImports>" + EOL);
-        }
-    }
-    
-    private void visitGlobals(Map<String, String> globals, StringBuilder xmlDump) {
-        if (globals != null && globals.size() > 0) {
-            xmlDump.append("    <globals>" + EOL);
-            for (Map.Entry<String, String> global: globals.entrySet()) {
-                xmlDump.append("      <global identifier=\"" + global.getKey() + "\" type=\"" + global.getValue() + "\" />" + EOL);
-            }
-            xmlDump.append("    </globals>" + EOL);
-        }
-    }
-    
-    public static void visitVariables(List<Variable> variables, StringBuilder xmlDump) {
-        if (variables != null && variables.size() > 0) {
-            xmlDump.append("    <variables>" + EOL);
-            for (Variable variable: variables) {
-                xmlDump.append("      <variable name=\"" + variable.getName() + "\" >" + EOL);
-                visitDataType(variable.getType(), xmlDump);
-                Object value = variable.getValue();
-                if (value != null) {
-                    visitValue(variable.getValue(), variable.getType(), xmlDump);
-                }
-                xmlDump.append("      </variable>" + EOL);
-            }
-            xmlDump.append("    </variables>" + EOL);
-        }
-    }
-    
-    private void visitSwimlanes(Collection<Swimlane> swimlanes, StringBuilder xmlDump) {
-        if (swimlanes != null && swimlanes.size() > 0) {
-            xmlDump.append("    <swimlanes>" + EOL);
-            for (Swimlane swimlane: swimlanes) {
-                xmlDump.append("      <swimlane name=\"" + swimlane.getName() + "\" />" + EOL);
-            }
-            xmlDump.append("    </swimlanes>" + EOL);
-        }
-    }
-    
-    public static void visitExceptionHandlers(Map<String, ExceptionHandler> exceptionHandlers, StringBuilder xmlDump) {
-        if (exceptionHandlers != null && exceptionHandlers.size() > 0) {
-            xmlDump.append("    <exceptionHandlers>" + EOL);
-            for (Map.Entry<String, ExceptionHandler> entry: exceptionHandlers.entrySet()) {
-            	ExceptionHandler exceptionHandler = entry.getValue();
-            	if (exceptionHandler instanceof ActionExceptionHandler) {
-            		ActionExceptionHandler actionExceptionHandler = (ActionExceptionHandler) exceptionHandler;
-            		xmlDump.append("      <exceptionHandler faultName=\"" + entry.getKey() + "\" type=\"action\" ");
-            		String faultVariable = exceptionHandler.getFaultVariable();
-            		if (faultVariable != null && faultVariable.length() > 0) {
-            			xmlDump.append("faultVariable=\"" + faultVariable + "\" ");
-            		}
-        			xmlDump.append(">" + EOL);
-        			DroolsAction action = actionExceptionHandler.getAction();
-        			if (action != null) {
-        				AbstractNodeHandler.writeAction(action, xmlDump);
-        			}
-        			xmlDump.append("      </exceptionHandler>" + EOL);
-            	} else {
-            		throw new IllegalArgumentException(
-        				"Unknown exception handler type: " + exceptionHandler);
-            	}
-            }
-            xmlDump.append("    </exceptionHandlers>" + EOL);
-        }
-    }
-    
-    public static void visitDataType(DataType dataType, StringBuilder xmlDump) {
-        xmlDump.append("        <type name=\"" + dataType.getClass().getName() + "\" ");
-        // TODO make this pluggable so datatypes can write out other properties as well
-        if (dataType instanceof ObjectDataType) {
-        	String className = ((ObjectDataType) dataType).getClassName();
-        	if (className != null
-        			&& className.trim().length() > 0 
-        			&& !"java.lang.Object".equals(className)) {
-        		xmlDump.append("className=\"" + className + "\" ");
-        	}
-        }
-        xmlDump.append("/>" + EOL);
-    }
-    
-    public static void visitValue(Object value, DataType dataType, StringBuilder xmlDump) {
-		xmlDump.append("        <value>" + XmlDumper.replaceIllegalChars(dataType.writeValue(value)) + "</value>" + EOL);
-    }
-    
-    private void visitNodes(WorkflowProcess process, StringBuilder xmlDump, boolean includeMeta) {
-        xmlDump.append("  <nodes>" + EOL);
-        for (Node node: process.getNodes()) {
-            visitNode(node, xmlDump, includeMeta);
-        }
-        xmlDump.append("  </nodes>" + EOL + EOL);
-    }
-    
-    public void visitNode(Node node, StringBuilder xmlDump, boolean includeMeta) {
-     	Handler handler = semanticModule.getHandlerByClass(node.getClass());
-        if (handler != null) {
-        	((AbstractNodeHandler) handler).writeNode((org.drools.workflow.core.Node) node, xmlDump, includeMeta);
-        } else {
-        	throw new IllegalArgumentException(
-                "Unknown node type: " + node);
-        }
-    }
-    
-    private void visitConnections(Node[] nodes, StringBuilder xmlDump, boolean includeMeta) {
-        List<Connection> connections = new ArrayList<Connection>();
-        for (Node node: nodes) {
-            for (List<Connection> connectionList: node.getIncomingConnections().values()) {
-                connections.addAll(connectionList);
-            }
-        }
-        xmlDump.append("  <connections>" + EOL);
-        for (Connection connection: connections) {
-            visitConnection(connection, xmlDump, includeMeta);
-        }
-        xmlDump.append("  </connections>" + EOL + EOL);
-    }
-    
-    public void visitConnection(Connection connection, StringBuilder xmlDump, boolean includeMeta) {
-        xmlDump.append("    <connection from=\"" + connection.getFrom().getId() + "\" ");
-        if (!NodeImpl.CONNECTION_DEFAULT_TYPE.equals(connection.getFromType())) {
-            xmlDump.append("fromType=\"" + connection.getFromType() + "\" ");
-        }
-        xmlDump.append("to=\"" + connection.getTo().getId() + "\" ");
-        if (!NodeImpl.CONNECTION_DEFAULT_TYPE.equals(connection.getToType())) {
-            xmlDump.append("toType=\"" + connection.getToType() + "\" ");
-        }
-        if (includeMeta) {
-            String bendpoints = (String) connection.getMetaData("bendpoints");
-            if (bendpoints != null) {
-                xmlDump.append("bendpoints=\"" + bendpoints + "\" ");
-            }
-        }
-        xmlDump.append("/>" + EOL);
-    }
-    
-}

Deleted: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/StoreHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/StoreHandler.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/StoreHandler.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,82 +0,0 @@
-package org.drools.compiler.xml;
-
-import java.util.HashSet;
-
-import org.drools.compiler.xml.ProcessBuildData;
-import org.drools.definition.process.Process;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
-import org.drools.workflow.core.impl.WorkflowProcessImpl;
-import org.drools.workflow.core.node.ActionNode;
-import org.drools.workflow.core.node.StartNode;
-import org.drools.xml.BaseAbstractHandler;
-import org.drools.xml.ExtensibleXmlParser;
-import org.drools.xml.Handler;
-import org.w3c.dom.Element;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-public class StoreHandler extends BaseAbstractHandler
-    implements
-    Handler {
-    public StoreHandler() {
-        if ( (this.validParents == null) && (this.validPeers == null) ) {
-            this.validParents = new HashSet();
-            this.validParents.add( Process.class );
-
-            this.validPeers = new HashSet();            
-            this.validPeers.add( StartNode.class );
-            this.validPeers.add( ActionNode.class );            
-
-            this.allowNesting = false;
-        }
-    }
-    
-
-    
-    public Object start(final String uri,
-                        final String localName,
-                        final Attributes attrs,
-                        final ExtensibleXmlParser xmlPackageReader) throws SAXException {
-        xmlPackageReader.startElementBuilder( localName,
-                                                  attrs );
-        
-        WorkflowProcessImpl  process = ( WorkflowProcessImpl ) xmlPackageReader.getParent();
-        
-        ActionNode actionNode = new ActionNode();
-        
-        final String name = attrs.getValue( "name" );        
-        emptyAttributeCheck( localName, "name", name, xmlPackageReader );        
-        actionNode.setName( name );
-        
-        final String id = attrs.getValue( "id" );        
-        emptyAttributeCheck( localName, "id", name, xmlPackageReader );        
-        actionNode.setId( new Long(id) );
-        
-        process.addNode( actionNode );
-        ((ProcessBuildData)xmlPackageReader.getData()).addNode( actionNode );
-        
-        return actionNode;
-    }    
-    
-    public Object end(final String uri,
-                      final String localName,
-                      final ExtensibleXmlParser xmlPackageReader) throws SAXException {
-        final Element element = xmlPackageReader.endElementBuilder();
-        WorkflowProcessImpl  process = ( WorkflowProcessImpl ) xmlPackageReader.getParent();
-
-        ActionNode actionNode = ( ActionNode ) xmlPackageReader.getCurrent();
-        
-        String text = ((org.w3c.dom.Text)element.getChildNodes().item( 0 )).getWholeText();
-        
-        DroolsConsequenceAction actionText = new DroolsConsequenceAction( "mvel", "list.add(\"" + text + "\")" );
-        
-        actionNode.setAction( actionText );
-        
-        return actionNode;
-    }
-
-    public Class generateNodeFor() {
-        return ActionNode.class;
-    }    
-
-}

Deleted: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/TestXml.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/TestXml.java	2010-09-02 21:47:14 UTC (rev 34981)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/xml/TestXml.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -1,29 +0,0 @@
-package org.drools.compiler.xml;
-
-import java.io.InputStreamReader;
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.drools.compiler.xml.ProcessSemanticModule;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.xml.SemanticModules;
-
-public class TestXml extends TestCase {
-
-    public void testSimpleXml() throws Exception {
-        SemanticModules modules = new SemanticModules();
-        modules.addSemanticModule(new ProcessSemanticModule());
-        XmlProcessReader reader = new XmlProcessReader(modules);
-        reader.read(new InputStreamReader(TestXml.class.getResourceAsStream("XmlTest.xml")));
-        RuleFlowProcess process = (RuleFlowProcess) reader.getProcess();
-        assertNotNull(process);
-
-        String output = XmlRuleFlowProcessDumper.INSTANCE.dump(process);
-        System.out.println(output);
-        reader = new XmlProcessReader(new SemanticModules());
-        reader.read(new StringReader(output));
-    }
-}

Added: labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/compiler/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/compiler/Activator.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-flow-compiler/src/main/java/org/drools/osgi/flow/compiler/Activator.java	2010-09-02 21:52:21 UTC (rev 34982)
@@ -0,0 +1,30 @@
+package org.drools.osgi.flow.compiler;
+
+import java.util.Hashtable;
+
+import org.drools.Service;
+import org.drools.compiler.ProcessBuilderFactoryService;
+import org.drools.process.builder.ProcessBuilderFactoryServiceImpl;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator
+    implements
+    BundleActivator {
+
+    private ServiceRegistration processBuilderReg;
+
+    public void start(BundleContext bc) throws Exception {
+        System.out.println( "registering flow compiler services" );
+        this.processBuilderReg = bc.registerService( new String[]{ ProcessBuilderFactoryService.class.getName(), Service.class.getName()},
+                                                                   new ProcessBuilderFactoryServiceImpl(),
+                                                                   new Hashtable() );
+        System.out.println( "flow compiler services registered" );
+    }
+
+    public void stop(BundleContext bc) throws Exception {
+        this.processBuilderReg.unregister();
+    }
+
+}
\ No newline at end of file



More information about the jboss-svn-commits mailing list