[jbosstools-commits] JBoss Tools SVN: r28004 - in trunk/drools: features and 19 other directories.

Author: nickboldt Date: 2011-01-07 18:01:52 -0500 (Fri, 07 Jan 2011) New Revision: 28004 Removed: trunk/drools/features/org.drools.eclipse.feature/pom.xml trunk/drools/features/org.drools.eclipse.task.feature/pom.xml trunk/drools/features/org.guvnor.tools.feature/pom.xml trunk/drools/features/pom.xml trunk/drools/plugins/org.drools.eclipse.task/pom.xml trunk/drools/plugins/org.drools.eclipse/pom.xml trunk/drools/plugins/org.eclipse.webdav/.classpath trunk/drools/plugins/org.eclipse.webdav/.project trunk/drools/plugins/org.eclipse.webdav/pom.xml trunk/drools/plugins/org.guvnor.tools/.classpath trunk/drools/plugins/org.guvnor.tools/.project trunk/drools/plugins/org.guvnor.tools/pom.xml trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.classpath trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.project trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF trunk/drools/plugins/org.jboss.tools.flow.ruleflow/build.properties trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/connection.gif trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/process.gif trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/start.gif trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/antlr-runtime.jar trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/core-3.2.3.v_686_R32x.jar trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/drools-compiler.jar trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/drools-core.jar trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/mvel.jar trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.properties trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowWrapperBuilder.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/NodeImpl.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/EndNodeAcceptsOutgoingConnectionStrategy.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/ProcessAcceptsElementStrategy.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsIncomingConnectionStrategy.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsOutgoingConnectionStrategy.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/StartNodeAcceptsIncomingConnectionStrategy.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessDumper.java trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessReader.java trunk/drools/plugins/pom.xml Modified: trunk/drools/build.xml trunk/drools/pom-with-deps.xml trunk/drools/pom.xml Log: remove local sources and update build.xml to pull from upstream update site zip & create one locally for publishing Modified: trunk/drools/build.xml =================================================================== --- trunk/drools/build.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/build.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -56,7 +56,7 @@ <!-- <delete file="${WORKINGDIR}/${COMPONENT}/${drools.zip}" quiet="true"/> --> <delete dir="${WORKINGDIR}/${COMPONENT}/drools-update-site" quiet="true" /> - <delete dir="${WORKINGDIR}/${COMPONENT}" quiet="true" includes="ReadMeDroolsEclipse.txt" /> + <delete dir="${WORKINGDIR}/${COMPONENT}" quiet="true" includes="ReadMeDroolsEclipse.txt, LICENSE-ASL-2.0.txt" /> </target> Deleted: trunk/drools/features/org.drools.eclipse.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.feature/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/features/org.drools.eclipse.feature/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.drools.eclipse.feature</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> Deleted: trunk/drools/features/org.drools.eclipse.task.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.drools.eclipse.task.feature</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> Deleted: trunk/drools/features/org.guvnor.tools.feature/pom.xml =================================================================== --- trunk/drools/features/org.guvnor.tools.feature/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/features/org.guvnor.tools.feature/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.guvnor.tools.feature</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-feature</packaging> -</project> Deleted: trunk/drools/features/pom.xml =================================================================== --- trunk/drools/features/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/features/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.jboss.tools.drools.features</artifactId> - <name>org.jboss.tools.drools.features</name> - <version>0.0.1-SNAPSHOT</version> - <packaging>pom</packaging> - <modules> - <module>org.drools.eclipse.feature</module> - <module>org.drools.eclipse.task.feature</module> - <module>org.guvnor.tools.feature</module> - </modules> -</project> Deleted: trunk/drools/plugins/org.drools.eclipse/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.drools.eclipse</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> Deleted: trunk/drools/plugins/org.drools.eclipse.task/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.drools.eclipse.task</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> Deleted: trunk/drools/plugins/org.eclipse.webdav/.classpath =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/.classpath 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.eclipse.webdav/.classpath 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/kernel"/> - <classpathentry kind="src" path="src/interface"/> - <classpathentry kind="src" path="src/client"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: trunk/drools/plugins/org.eclipse.webdav/.project =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/.project 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.eclipse.webdav/.project 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.webdav</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: trunk/drools/plugins/org.eclipse.webdav/pom.xml =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.eclipse.webdav/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.eclipse.webdav</artifactId> - <version>3.0.101</version> - <packaging>eclipse-plugin</packaging> -</project> Deleted: trunk/drools/plugins/org.guvnor.tools/.classpath =================================================================== --- trunk/drools/plugins/org.guvnor.tools/.classpath 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.guvnor.tools/.classpath 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: trunk/drools/plugins/org.guvnor.tools/.project =================================================================== --- trunk/drools/plugins/org.guvnor.tools/.project 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.guvnor.tools/.project 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.guvnor.tools</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: trunk/drools/plugins/org.guvnor.tools/pom.xml =================================================================== --- trunk/drools/plugins/org.guvnor.tools/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,14 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.guvnor.tools</artifactId> - <version>5.2.0.SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.classpath =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.classpath 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.classpath 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/> - <classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar"/> - <classpathentry exported="true" kind="lib" path="lib/antlr-runtime.jar"/> - <classpathentry exported="true" kind="lib" path="lib/core-3.2.3.v_686_R32x.jar"/> - <classpathentry exported="true" kind="lib" path="lib/mvel.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.project =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.project 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.project 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.flow.ruleflow</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/.settings/org.eclipse.jdt.core.prefs 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,8 +0,0 @@ -#Tue Jul 15 11:45:52 CEST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.source=1.5 Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,23 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.flow.ruleflow;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.tools.process.ruleflow.Activator -Bundle-Vendor: %Bundle-Vendor.0 -Require-Bundle: - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.gef, - org.eclipse.ui, - org.eclipse.ui.ide, - org.jboss.tools.flow.common -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: ., - lib/drools-core.jar, - lib/drools-compiler.jar, - lib/antlr-runtime.jar, - lib/core-3.2.3.v_686_R32x.jar, - lib/mvel.jar -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Localization: plugin Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/build.properties =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/build.properties 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/build.properties 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,11 +0,0 @@ -source.. = src/main/java/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - lib/drools-core.jar,\ - lib/drools-compiler.jar,\ - lib/antlr-runtime.jar,\ - lib/core-3.2.3.v_686_R32x.jar,\ - lib/mvel.jar,\ - plugin.properties Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/connection.gif =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/process.gif =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/icons/start.gif =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/antlr-runtime.jar =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/core-3.2.3.v_686_R32x.jar =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/drools-compiler.jar =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/drools-core.jar =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/lib/mvel.jar =================================================================== (Binary files differ) Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.properties =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.properties 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.properties 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,3 +0,0 @@ -#Properties file for org.jboss.tools.flow.ruleflow -Bundle-Vendor.0 = JBoss -Bundle-Name.0 = JBoss Tools Ruleflow Plug-in \ No newline at end of file Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - - <extension point="org.eclipse.ui.editors"> - <editor - name="RuleFlow Editor" - extensions="rf" - icon="icons/process.gif" - contributorClass="org.jboss.tools.flow.common.editor.GenericActionBarContributor" - class="org.jboss.tools.process.ruleflow.editor.RuleFlowEditor" - id="org.jboss.tools.process.ruleflow.editor.RuleFlowModelEditor"> - </editor> - </extension> - - <extension point="org.jboss.tools.flow.common.languages"> - <language - editor="org.jboss.tools.flow.ruleflow.editor" - id="org.jboss.tools.flow.ruleflow" - name="Drools Flow"> - </language> - </extension> - - <extension point="org.jboss.tools.flow.common.elements"> - <element - class="org.jboss.tools.process.ruleflow.model.RuleFlowProcess" - figure="icons/process.gif" - id="org.jboss.tools.flow.ruleflow.process" - language="org.jboss.tools.flow.ruleflow" - name="Process"> - <flow acceptsElementStrategy="org.jboss.tools.process.ruleflow.strategy.ProcessAcceptsElementStrategy" /> - </element> - <element - class="org.jboss.tools.process.ruleflow.model.node.StartNode" - figure="icons/start.gif" - id="org.jboss.tools.flow.ruleflow.start" - language="org.jboss.tools.flow.ruleflow" - name="Start"> - <node acceptsIncomingConnectionStrategy="org.jboss.tools.process.ruleflow.strategy.StartNodeAcceptsIncomingConnectionStrategy" - acceptsOutgoingConnectionStrategy="org.jboss.tools.process.ruleflow.strategy.SequenceNodeAcceptsOutgoingConnectionStrategy"> - <figure icon="icons/start.gif"> - <rectangle></rectangle> - </figure> - </node> - </element> - <element - class="org.jboss.tools.process.ruleflow.model.node.SubProcessNode" - figure="icons/process.gif" - id="org.jboss.tools.flow.ruleflow.subProcess" - language="org.jboss.tools.flow.ruleflow" - name="SubProcess"> - <node acceptsIncomingConnectionStrategy="org.jboss.tools.process.ruleflow.strategy.SequenceNodeAcceptsIncomingConnectionStrategy" - acceptsOutgoingConnectionStrategy="org.jboss.tools.process.ruleflow.strategy.SequenceNodeAcceptsOutgoingConnectionStrategy"> - <figure color="255,250,205" icon="icons/process.gif"> - <rounded-rectangle></rounded-rectangle> - </figure> - </node> - </element> - <element - class="org.jboss.tools.process.ruleflow.model.ConnectionImpl" - figure="icons/connection.gif" - id="org.jboss.tools.flow.ruleflow.connection" - language="org.jboss.tools.flow.ruleflow" - name="Connection"> - <connection> - </connection> - </element> - </extension> - -</plugin> Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,13 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.jboss.tools.flow.ruleflow</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Activator.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,45 +0,0 @@ -package org.jboss.tools.process.ruleflow; - -/* - * Copyright 2005 JBoss Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -public class Activator extends AbstractUIPlugin { - - public static final String PLUGIN_ID = "org.jboss.tools.process.ruleflow"; //$NON-NLS-1$ - - private static Activator plugin; - - public Activator() { - } - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - public static Activator getDefault() { - return plugin; - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/Messages.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,20 +0,0 @@ -package org.jboss.tools.process.ruleflow; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.process.ruleflow.messages"; //$NON-NLS-1$ - public static String RuleFlowPaletteFactory_ConnectionDesc; - public static String RuleFlowPaletteFactory_ConnectionLabel; - public static String RuleFlowPaletteFactory_StartDesc; - public static String RuleFlowPaletteFactory_StartLabel; - public static String RuleFlowPaletteFactory_SubProcessDesc; - public static String RuleFlowPaletteFactory_SubProcessLabel; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowEditor.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,82 +0,0 @@ -package org.jboss.tools.process.ruleflow.editor; - -/* - * Copyright 2005 JBoss Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; - -import org.eclipse.gef.palette.PaletteRoot; -import org.jboss.tools.flow.common.Activator; -import org.jboss.tools.flow.common.editor.GenericModelEditor; -import org.jboss.tools.flow.common.registry.ElementRegistry; -import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper; -import org.jboss.tools.process.ruleflow.model.RuleFlowProcess; -import org.jboss.tools.process.ruleflow.xml.XmlRuleFlowProcessDumper; -import org.jboss.tools.process.ruleflow.xml.XmlRuleFlowProcessReader; - -/** - * Graphical editor for a RuleFlow. - * - * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> - */ -public class RuleFlowEditor extends GenericModelEditor { - - protected PaletteRoot createPalette() { - return new RuleFlowPaletteFactory().createPalette(); - } - - protected Object createModel() { - return ElementRegistry.createWrapper("org.jboss.tools.flow.ruleflow.process"); //$NON-NLS-1$ - } - - protected void writeModel(OutputStream os) throws IOException { - OutputStreamWriter writer = new OutputStreamWriter(os); - try { - RuleFlowProcess process = (RuleFlowProcess) ((AbstractFlowWrapper) getModel()).getElement(); - String out = XmlRuleFlowProcessDumper.dump(process); - writer.write(out); - } catch (Throwable t) { - Activator.log(t); - } - writer.close(); - } - - protected void createModel(InputStream is) { - try { - InputStreamReader reader = new InputStreamReader(is); - XmlRuleFlowProcessReader xmlReader = new XmlRuleFlowProcessReader(); - try { - RuleFlowProcess process = (RuleFlowProcess) xmlReader.read(reader); - if (process == null) { - setModel(createModel()); - } else { - setModel(new RuleFlowWrapperBuilder().getProcessWrapper(process)); - } - } catch (Throwable t) { - Activator.log(t); - setModel(createModel()); - } - reader.close(); - } catch (Throwable t) { - Activator.log(t); - } - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,82 +0,0 @@ -package org.jboss.tools.process.ruleflow.editor; - -/* - * Copyright 2005 JBoss Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.gef.palette.CombinedTemplateCreationEntry; -import org.eclipse.gef.palette.ConnectionCreationToolEntry; -import org.eclipse.gef.palette.PaletteContainer; -import org.eclipse.gef.palette.PaletteEntry; -import org.eclipse.gef.palette.PaletteRoot; -import org.eclipse.jface.resource.ImageDescriptor; -import org.jboss.tools.flow.common.editor.PaletteFactory; -import org.jboss.tools.flow.common.registry.ElementRegistry; -import org.jboss.tools.process.ruleflow.Activator; -import org.jboss.tools.process.ruleflow.Messages; - -/** - * Factory for creating a RuleFlow palette. - * - * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a> - */ -public class RuleFlowPaletteFactory extends PaletteFactory { - - protected PaletteContainer createControlGroup(PaletteRoot root) { - PaletteContainer controlGroup = super.createControlGroup(root); - controlGroup.add(createConnectionEntry()); - return controlGroup; - } - - protected PaletteEntry createConnectionEntry() { - return new ConnectionCreationToolEntry( - Messages.RuleFlowPaletteFactory_ConnectionLabel, - Messages.RuleFlowPaletteFactory_ConnectionDesc, - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.connection"), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/connection.gif")) //$NON-NLS-1$ - ); - } - - protected List<PaletteEntry> createComponentEntries() { - List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); - - CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - Messages.RuleFlowPaletteFactory_StartLabel, - Messages.RuleFlowPaletteFactory_StartDesc, - "org.jboss.tools.flow.ruleflow.start", //$NON-NLS-1$ - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.start"), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")) //$NON-NLS-1$ - ); - entries.add(combined); - - combined = new CombinedTemplateCreationEntry( - Messages.RuleFlowPaletteFactory_SubProcessLabel, - Messages.RuleFlowPaletteFactory_SubProcessDesc, - "org.jboss.tools.flow.ruleflow.subProcess", //$NON-NLS-1$ - ElementRegistry.getCreationFactory("org.jboss.tools.flow.ruleflow.subProcess"), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")), //$NON-NLS-1$ - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/process.gif")) //$NON-NLS-1$ - ); - entries.add(combined); - - return entries; - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowWrapperBuilder.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowWrapperBuilder.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowWrapperBuilder.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,68 +0,0 @@ -package org.jboss.tools.process.ruleflow.editor; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Flow; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper; -import org.jboss.tools.flow.common.wrapper.DefaultFlowWrapper; -import org.jboss.tools.flow.common.wrapper.DefaultNodeWrapper; -import org.jboss.tools.flow.common.wrapper.NodeWrapper; -import org.jboss.tools.process.ruleflow.model.RuleFlowProcess; - -public class RuleFlowWrapperBuilder { - - public DefaultFlowWrapper getProcessWrapper(Flow process) { - if (process instanceof RuleFlowProcess) { - RuleFlowProcess ruleFlowProcess = (RuleFlowProcess) process; - DefaultFlowWrapper processWrapper = new DefaultFlowWrapper(); - processWrapper.setElement(process); - Set<Node> nodes = new HashSet<Node>(); - nodes.addAll(ruleFlowProcess.getNodes()); - Set<Connection> connections = new HashSet<Connection>(); - processNodes(nodes, connections, processWrapper); - return processWrapper; - } - return null; - } - - public static void processNodes(Set<Node> nodes, Set<Connection> connections, DefaultFlowWrapper container) { - Map<Node, NodeWrapper> nodeWrappers = new HashMap<Node, NodeWrapper>(); - for (Node node: nodes) { - NodeWrapper nodeWrapper = new DefaultNodeWrapper(); - nodeWrapper.setElement(node); - nodeWrapper.setParent(container); - container.localAddElement(nodeWrapper); - nodeWrappers.put(node, nodeWrapper); - for (List<Connection> inConnections: node.getIncomingConnections().values()) { - for (Connection connection: inConnections) { - connections.add(connection); - } - } - for (List<Connection> outConnections: node.getOutgoingConnections().values()) { - for (Connection connection: outConnections) { - connections.add(connection); - } - } - } - for (Connection connection: connections) { - DefaultConnectionWrapper connectionWrapper = new DefaultConnectionWrapper(); - connectionWrapper.setElement(connection); - connectionWrapper.localSetBendpoints(null); - NodeWrapper from = nodeWrappers.get(connection.getFrom()); - NodeWrapper to = nodeWrappers.get(connection.getTo()); - if (from != null && to != null) { - connectionWrapper.localSetSource(from); - from.localAddOutgoingConnection(connectionWrapper); - connectionWrapper.localSetTarget(to); - to.localAddIncomingConnection(connectionWrapper); - } - } - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/messages.properties 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,6 +0,0 @@ -RuleFlowPaletteFactory_ConnectionDesc=Creating a new connection -RuleFlowPaletteFactory_ConnectionLabel=Connection -RuleFlowPaletteFactory_StartDesc=Create a new start node -RuleFlowPaletteFactory_StartLabel=Start -RuleFlowPaletteFactory_SubProcessDesc=Create a new sub process node -RuleFlowPaletteFactory_SubProcessLabel=SubProcess Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/ConnectionImpl.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,98 +0,0 @@ -package org.jboss.tools.process.ruleflow.model; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.registry.ElementRegistry; - -public class ConnectionImpl implements Connection { - - private org.drools.workflow.core.impl.ConnectionImpl connection; - - private Node from; - private Node to; - private Map<String, Object> metaData = new HashMap<String, Object>(); - - public ConnectionImpl() { - } - - public ConnectionImpl(Node from, String fromType, Node to, String toType) { - this.from = from; - this.to = to; - this.connection = new org.drools.workflow.core.impl.ConnectionImpl( - ((NodeImpl) from).getNode(), fromType, - ((NodeImpl) to).getNode(), toType); - } - - public ConnectionImpl(org.drools.workflow.core.Connection connection, Node from, Node to) { - this.connection = (org.drools.workflow.core.impl.ConnectionImpl) connection; - // TODO XML should contain this meta-data - setMetaData("configurationElement", //$NON-NLS-1$ - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.connection")); //$NON-NLS-1$ - this.from = from; - this.to = to; - } - - public org.drools.workflow.core.Connection getConnection() { - return connection; - } - - public Node getFrom() { - return from; - } - - public void setFrom(Node from) { - if (connection != null) { - connection.terminate(); - connection = null; - } - this.from = from; - if (from != null && to != null) { - connection = new org.drools.workflow.core.impl.ConnectionImpl( - ((NodeImpl) from).getNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, - ((NodeImpl) to).getNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE); - for (Map.Entry<String, Object> entry: metaData.entrySet()) { - connection.setMetaData(entry.getKey(), entry.getValue()); - } - } - } - - public String getFromType() { - return connection == null ? null : connection.getFromType(); - } - - public Node getTo() { - return to; - } - - public void setTo(Node to) { - if (connection != null) { - connection.terminate(); - connection = null; - } - this.to = to; - if (from != null && to != null) { - connection = new org.drools.workflow.core.impl.ConnectionImpl( - ((NodeImpl) from).getNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, - ((NodeImpl) to).getNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE); - } - } - - public String getToType() { - return connection == null ? null : connection.getToType(); - } - - public Object getMetaData(String name) { - return metaData.get(name); - } - - public void setMetaData(String name, Object value) { - metaData.put(name, value); - if (connection != null) { - connection.setMetaData(name, value); - } - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/NodeImpl.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/NodeImpl.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/NodeImpl.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,126 +0,0 @@ -package org.jboss.tools.process.ruleflow.model; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Container; -import org.jboss.tools.flow.common.model.Node; - -public class NodeImpl implements Node { - - private org.drools.workflow.core.Node node; - - private Container nodeContainer; - private Map<String, List<Connection>> incomingConnections = new HashMap<String, List<Connection>>(); - private Map<String, List<Connection>> outgoingConnections = new HashMap<String, List<Connection>>(); - - public NodeImpl(org.drools.workflow.core.Node node) { - this.node = node; - } - - public org.drools.workflow.core.Node getNode() { - return node; - } - - public void addIncomingConnection(String type, Connection connection) { - internalAddIncomingConnection(type, connection); - node.addIncomingConnection(type, ((ConnectionImpl) connection).getConnection()); - } - - public void internalAddIncomingConnection(String type, Connection connection) { - List<Connection> list = incomingConnections.get(type); - if (list == null) { - list = new ArrayList<Connection>(); - incomingConnections.put(type, list); - } - list.add(connection); - } - - public void addOutgoingConnection(String type, Connection connection) { - internalAddOutgoingConnection(type, connection); - node.addOutgoingConnection(type, ((ConnectionImpl) connection).getConnection()); - } - - public void internalAddOutgoingConnection(String type, Connection connection) { - List<Connection> list = outgoingConnections.get(type); - if (list == null) { - list = new ArrayList<Connection>(); - outgoingConnections.put(type, list); - } - list.add(connection); - } - - public long getId() { - return node.getId(); - } - - public Map<String, List<Connection>> getIncomingConnections() { - return incomingConnections; - } - - public List<Connection> getIncomingConnections(String type) { - return incomingConnections.get(type); - } - - public Object getMetaData(String name) { - return node.getMetaData(name); - } - - public String getName() { - return node.getName(); - } - - public Container getNodeContainer() { - return nodeContainer; - } - - public Map<String, List<Connection>> getOutgoingConnections() { - return outgoingConnections; - } - - public List<Connection> getOutgoingConnections(String type) { - return outgoingConnections.get(type); - } - - public void removeIncomingConnection(String type, Connection connection) { - List<Connection> list = incomingConnections.get(type); - if (list != null) { - list.remove(connection); - if (list.isEmpty()) { - incomingConnections.remove(type); - } - } - node.removeIncomingConnection(type, ((ConnectionImpl) connection).getConnection()); - } - - public void removeOutgoingConnection(String type, Connection connection) { - List<Connection> list = outgoingConnections.get(type); - if (list != null) { - list.remove(connection); - if (list.isEmpty()) { - outgoingConnections.remove(type); - } - } - node.removeOutgoingConnection(type, ((ConnectionImpl) connection).getConnection()); - } - - public void setId(long id) { - node.setId(id); - } - - public void setMetaData(String name, Object value) { - node.setMetaData(name, value); - } - - public void setName(String name) { - node.setName(name); - } - - public void setNodeContainer(Container nodeContainer) { - this.nodeContainer = nodeContainer; - node.setNodeContainer(((RuleFlowProcess) nodeContainer).getRuleFlowProcess()); - } -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/RuleFlowProcess.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,134 +0,0 @@ -package org.jboss.tools.process.ruleflow.model; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.jboss.tools.flow.common.model.Flow; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.registry.ElementRegistry; -import org.jboss.tools.process.ruleflow.model.node.StartNode; -import org.jboss.tools.process.ruleflow.model.node.SubProcessNode; - -public class RuleFlowProcess implements Flow { - - private org.drools.ruleflow.core.RuleFlowProcess process; - - private Map<Long, Node> nodes = new HashMap<Long, Node>(); - - public RuleFlowProcess() { - this.process = new org.drools.ruleflow.core.RuleFlowProcess(); - } - - public RuleFlowProcess(org.drools.ruleflow.core.RuleFlowProcess process) { - this.process = process; - // TODO XML should contain this meta-data - setMetaData("configurationElement", //$NON-NLS-1$ - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.process")); //$NON-NLS-1$ - List<org.drools.workflow.core.Connection> connections = new ArrayList<org.drools.workflow.core.Connection>(); - for (org.drools.workflow.core.Node node: process.getNodes()) { - Node newNode = null; - if (node instanceof org.drools.workflow.core.node.StartNode) { - newNode = new StartNode((org.drools.workflow.core.node.StartNode) node); - } else if (node instanceof org.drools.workflow.core.node.SubProcessNode) { - newNode = new SubProcessNode((org.drools.workflow.core.node.SubProcessNode) node); - } - if (newNode == null) { - throw new IllegalArgumentException("Could not find NodeImpl for node " + newNode); //$NON-NLS-1$ - } - this.nodes.put(node.getId(), newNode); - for (List<org.drools.workflow.core.Connection> inConnections: node.getIncomingConnections().values()) { - for (org.drools.workflow.core.Connection connection: inConnections) { - connections.add(connection); - } - } - } - for (org.drools.workflow.core.Connection connection: connections) { - NodeImpl from = (NodeImpl) nodes.get(connection.getFrom().getId()); - NodeImpl to = (NodeImpl) nodes.get(connection.getTo().getId()); - ConnectionImpl newConnection = new ConnectionImpl(connection, from, to); - from.internalAddOutgoingConnection(connection.getFromType(), newConnection); - to.internalAddIncomingConnection(connection.getToType(), newConnection); - } - } - - public org.drools.ruleflow.core.RuleFlowProcess getRuleFlowProcess() { - return process; - } - - public String getId() { - return process.getId(); - } - - public String getName() { - return process.getName(); - } - - public String getPackageName() { - return process.getPackageName(); - } - - public String getType() { - return process.getType(); - } - - public String getVersion() { - return process.getVersion(); - } - - public void setId(String id) { - process.setId(id); - } - - public void setName(String name) { - process.setName(name); - } - - public void setPackageName(String packageName) { - process.setPackageName(packageName); - } - - public void setType(String type) { - process.setType(type); - } - - public void setVersion(String version) { - process.setVersion(version); - } - - public void addNode(Node node) { - nodes.put(node.getId(), node); - process.addNode(((NodeImpl) node).getNode()); - } - - public Node getNode(long id) { - return nodes.get(id); - } - - public List<Node> getNodes() { - return new ArrayList<Node>(nodes.values()); - } - - public void removeNode(Node node) { - nodes.remove(node.getId()); - process.removeNode(((NodeImpl) node).getNode()); - } - - public Object getMetaData(String name) { - return process.getMetaData(name); - } - - public void setMetaData(String name, Object value) { - process.setMetaData(name, value); - } - - public StartNode getStart() { - org.drools.workflow.core.node.StartNode start = process.getStart(); - if (start == null) { - return null; - } - return (StartNode) nodes.get(start.getId()); - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/StartNode.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,19 +0,0 @@ -package org.jboss.tools.process.ruleflow.model.node; - -import org.jboss.tools.flow.common.registry.ElementRegistry; -import org.jboss.tools.process.ruleflow.model.NodeImpl; - -public class StartNode extends NodeImpl { - - public StartNode() { - super(new org.drools.workflow.core.node.StartNode()); - } - - public StartNode(org.drools.workflow.core.node.StartNode node) { - super(node); - // TODO XML should contain this meta-data - setMetaData("configurationElement", //$NON-NLS-1$ - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.start")); //$NON-NLS-1$ - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/model/node/SubProcessNode.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,19 +0,0 @@ -package org.jboss.tools.process.ruleflow.model.node; - -import org.jboss.tools.flow.common.registry.ElementRegistry; -import org.jboss.tools.process.ruleflow.model.NodeImpl; - -public class SubProcessNode extends NodeImpl { - - public SubProcessNode() { - super(new org.drools.workflow.core.node.SubProcessNode()); - } - - public SubProcessNode(org.drools.workflow.core.node.SubProcessNode node) { - super(node); - // TODO XML should contain this meta-data - setMetaData("configurationElement", //$NON-NLS-1$ - ElementRegistry.getConfigurationElement("org.jboss.tools.flow.ruleflow.subProcess")); //$NON-NLS-1$ - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/EndNodeAcceptsOutgoingConnectionStrategy.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/EndNodeAcceptsOutgoingConnectionStrategy.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/EndNodeAcceptsOutgoingConnectionStrategy.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,16 +0,0 @@ -package org.jboss.tools.process.ruleflow.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy; - -public class EndNodeAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy { - - public boolean acceptsOutgoingConnection(Connection connection, Node source) { - return false; - } - - public void setNode(Node node) { - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/ProcessAcceptsElementStrategy.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/ProcessAcceptsElementStrategy.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/ProcessAcceptsElementStrategy.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,28 +0,0 @@ -package org.jboss.tools.process.ruleflow.strategy; - -import org.jboss.tools.flow.common.model.Container; -import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy; -import org.jboss.tools.process.ruleflow.model.RuleFlowProcess; -import org.jboss.tools.process.ruleflow.model.node.StartNode; - -public class ProcessAcceptsElementStrategy implements AcceptsElementStrategy { - - private RuleFlowProcess process; - - public boolean acceptsElement(Object element) { - if (process == null) { - return false; - } else if (element instanceof StartNode) { - return process.getStart() == null; - } else { - return true; - } - } - - public void setContainer(Container container) { - if (container instanceof RuleFlowProcess) { - this.process = (RuleFlowProcess) container; - } - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsIncomingConnectionStrategy.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsIncomingConnectionStrategy.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsIncomingConnectionStrategy.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,22 +0,0 @@ -package org.jboss.tools.process.ruleflow.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy; - -public class SequenceNodeAcceptsIncomingConnectionStrategy implements AcceptsIncomingConnectionStrategy { - - private Node node; - - public boolean acceptsIncomingConnection(Connection connection, Node source) { - return - (source == null - || source.getNodeContainer() == node.getNodeContainer()) - && node.getIncomingConnections().isEmpty(); - } - - public void setNode(Node node) { - this.node = node; - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsOutgoingConnectionStrategy.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsOutgoingConnectionStrategy.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/SequenceNodeAcceptsOutgoingConnectionStrategy.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,22 +0,0 @@ -package org.jboss.tools.process.ruleflow.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy; - -public class SequenceNodeAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy { - - private Node node; - - public boolean acceptsOutgoingConnection(Connection connection, Node target) { - return - (target == null - || target.getNodeContainer() == node.getNodeContainer()) - && node.getOutgoingConnections().isEmpty(); - } - - public void setNode(Node node) { - this.node = node; - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/StartNodeAcceptsIncomingConnectionStrategy.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/StartNodeAcceptsIncomingConnectionStrategy.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/strategy/StartNodeAcceptsIncomingConnectionStrategy.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,16 +0,0 @@ -package org.jboss.tools.process.ruleflow.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy; - -public class StartNodeAcceptsIncomingConnectionStrategy implements AcceptsIncomingConnectionStrategy { - - public boolean acceptsIncomingConnection(Connection connection, Node source) { - return false; - } - - public void setNode(Node node) { - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessDumper.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessDumper.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessDumper.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,11 +0,0 @@ -package org.jboss.tools.process.ruleflow.xml; - -import org.jboss.tools.process.ruleflow.model.RuleFlowProcess; - -public class XmlRuleFlowProcessDumper { - - public static String dump(RuleFlowProcess process) { - return org.drools.xml.XmlRuleFlowProcessDumper.INSTANCE.dump(process.getRuleFlowProcess(), true); - } - -} Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessReader.java =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessReader.java 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/xml/XmlRuleFlowProcessReader.java 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,24 +0,0 @@ -package org.jboss.tools.process.ruleflow.xml; - -import java.io.Reader; - -import org.drools.compiler.PackageBuilderConfiguration; -import org.drools.xml.XmlProcessReader; -import org.jboss.tools.process.ruleflow.model.RuleFlowProcess; - -public class XmlRuleFlowProcessReader { - - private XmlProcessReader processReader; - - public XmlRuleFlowProcessReader() { - PackageBuilderConfiguration configuration = new PackageBuilderConfiguration(); - processReader = new XmlProcessReader(configuration.getSemanticModules()); - } - - public RuleFlowProcess read(Reader reader) throws Exception { - org.drools.ruleflow.core.RuleFlowProcess process = - (org.drools.ruleflow.core.RuleFlowProcess) processReader.read(reader); - return new RuleFlowProcess(process); - } - -} Deleted: trunk/drools/plugins/pom.xml =================================================================== --- trunk/drools/plugins/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/plugins/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -1,16 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.jboss.tools.drools.plugins</artifactId> - <name>org.jboss.tools.drools.plugins</name> - <version>0.0.1-SNAPSHOT</version> - <packaging>pom</packaging> - <modules> - <module>org.drools.eclipse</module> - <module>org.drools.eclipse.task</module> - <module>org.eclipse.webdav</module> - <module>org.guvnor.tools</module> - <module>org.jboss.tools.flow.ruleflow</module> - </modules> -</project> Modified: trunk/drools/pom-with-deps.xml =================================================================== --- trunk/drools/pom-with-deps.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/pom-with-deps.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -19,10 +19,7 @@ <module>../org.jboss.tools.ui.bot.ext</module> <module>../org.jboss.tools.jst.ui.bot.test</module> - <module>plugins</module> - <module>features</module> <module>tests</module> - <module>site</module> </modules> </project> Modified: trunk/drools/pom.xml =================================================================== --- trunk/drools/pom.xml 2011-01-07 22:58:11 UTC (rev 28003) +++ trunk/drools/pom.xml 2011-01-07 23:01:52 UTC (rev 28004) @@ -19,10 +19,7 @@ <!-- module>../org.jboss.tools.ui.bot.ext</module --> <!-- module>../org.jboss.tools.jst.ui.bot.test</module --> - <module>plugins</module> - <module>features</module> - <module>tests</module> - <module>site</module> + <module>tests</module> </modules> </project>