[jboss-svn-commits] JBL Code SVN: r9788 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools: rule/builder and 1 other directories.

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

Author: mark.proctor at jboss.com
Date: 2007-02-26 19:36:32 -0500 (Mon, 26 Feb 2007)
New Revision: 9788

Added:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/FunctionBuilder.java
Removed:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/FunctionBuilder.java
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
Log:
JBRULES-708 MVEL Integration
-More interface/implementation seperation for dialects

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-02-27 00:35:19 UTC (rev 9787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-02-27 00:36:32 UTC (rev 9788)
@@ -55,8 +55,8 @@
 import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
+import org.drools.rule.builder.FunctionBuilder;
 import org.drools.rule.builder.RuleBuilder;
-import org.drools.rule.builder.dialect.java.FunctionBuilder;
 import org.drools.rule.builder.dialect.java.JavaFunctionBuilder;
 import org.drools.rule.builder.dialect.java.PackageStore;
 import org.drools.spi.FunctionResolver;

Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/FunctionBuilder.java (from rev 9787, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/FunctionBuilder.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/FunctionBuilder.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/FunctionBuilder.java	2007-02-27 00:36:32 UTC (rev 9788)
@@ -0,0 +1,30 @@
+package org.drools.rule.builder;
+
+/*
+ * 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.Map;
+
+import org.codehaus.jfdi.interpreter.TypeResolver;
+import org.drools.lang.descr.FunctionDescr;
+import org.drools.rule.Package;
+
+public interface FunctionBuilder {
+    public String build(final Package pkg,
+                        final FunctionDescr functionDescr,
+                        final TypeResolver typeResolver,
+                        final Map lineMappings);
+}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/FunctionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/FunctionBuilder.java	2007-02-27 00:35:19 UTC (rev 9787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/FunctionBuilder.java	2007-02-27 00:36:32 UTC (rev 9788)
@@ -1,30 +0,0 @@
-package org.drools.rule.builder.dialect.java;
-
-/*
- * 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.Map;
-
-import org.codehaus.jfdi.interpreter.TypeResolver;
-import org.drools.lang.descr.FunctionDescr;
-import org.drools.rule.Package;
-
-public interface FunctionBuilder {
-    public String build(final Package pkg,
-                        final FunctionDescr functionDescr,
-                        final TypeResolver typeResolver,
-                        final Map lineMappings);
-}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2007-02-27 00:35:19 UTC (rev 9787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2007-02-27 00:36:32 UTC (rev 9788)
@@ -16,6 +16,7 @@
 import org.drools.lang.descr.FunctionDescr;
 import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
+import org.drools.rule.builder.FunctionBuilder;
 
 public class JavaFunctionBuilder
     implements