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

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

Author: KrisVerlaenen
Date: 2010-07-20 06:46:40 -0400 (Tue, 20 Jul 2010)
New Revision: 34059

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
Log:
- metadata unification

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -1,5 +1,7 @@
 package org.drools.definition.process;
 
+import java.util.Map;
+
 public interface Connection {
 
     Node getFrom();
@@ -10,6 +12,8 @@
 
     String getToType();
 
-    Object getMetaData(String name);
+    Map<String, Object> getMetaData();
 
+    @Deprecated Object getMetaData(String name);
+
 }

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -19,6 +19,8 @@
 
     NodeContainer getNodeContainer();
 
-    Object getMetaData(String name);
+    Map<String, Object> getMetaData();
 
+    @Deprecated Object getMetaData(String name);
+
 }

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -1,5 +1,7 @@
 package org.drools.definition.process;
 
+import java.util.Map;
+
 import org.drools.definition.KnowledgeDefinition;
 
 public interface Process
@@ -15,7 +17,9 @@
     String getPackageName();
 
     String getType();
+    
+    Map<String, Object> getMetaData();
 
-    Object getMetaData(String name);
+    @Deprecated Object getMetaData(String name);
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -1439,6 +1439,10 @@
                                   long id) {
             return null;
         }
+        
+    	public Map<String, Object> getMetaData() {
+    		return null;
+    	}
 
         public Object getMetaData(String name) {
             return null;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -135,6 +135,10 @@
         return null;
     }
     
+	public Map<String, Object> getMetaData() {
+		return this.metaData;
+	}
+
     public void setMetaData(String name, Object data) {
         this.metaData.put(name, data);
     }
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -115,6 +115,10 @@
 	public void setToType(String toType) {
 		this.toType = toType;
 	}
+	
+	public Map<String, Object> getMetaData() {
+		return this.metaData;
+	}
 
 	public void setMetaData(String name, Object value) {
         this.metaData.put(name, value);

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java	2010-07-20 10:45:04 UTC (rev 34058)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java	2010-07-20 10:46:40 UTC (rev 34059)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;