[jboss-svn-commits] JBL Code SVN: r35053 - in labs/jbossrules/branches/diega_esteban_jpm_integration_r34940: drools-templates/src/main/java/org/drools/template and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 7 22:28:14 EDT 2010
Author: diegoll
Date: 2010-09-07 22:28:14 -0400 (Tue, 07 Sep 2010)
New Revision: 35053
Modified:
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-simulator/pom.xml
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-templates/src/main/java/org/drools/template/DataProviderCompiler.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Cheese.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Person.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2/
Log:
[JBRULES-2616] merged with trunk rev35043
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-simulator/pom.xml
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-simulator/pom.xml 2010-09-08 02:20:07 UTC (rev 35052)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-simulator/pom.xml 2010-09-08 02:28:14 UTC (rev 35053)
@@ -28,6 +28,10 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-flow-compiler</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-templates/src/main/java/org/drools/template/DataProviderCompiler.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-templates/src/main/java/org/drools/template/DataProviderCompiler.java 2010-09-08 02:20:07 UTC (rev 35052)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-templates/src/main/java/org/drools/template/DataProviderCompiler.java 2010-09-08 02:28:14 UTC (rev 35053)
@@ -1,5 +1,3 @@
-package org.drools.template;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -15,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.drools.template;
import java.io.IOException;
import java.io.InputStream;
Property changes on: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
+ target
local
.*
nbproject
*.ipr
*.iws
*.iml
Property changes on: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader
___________________________________________________________________
Name: svn:ignore
- .externalToolBuilders
.settings
target
.classpath
.project
+ target
local
.*
nbproject
*.ipr
*.iws
*.iml
Property changes on: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test
___________________________________________________________________
Name: svn:ignore
- .settings
eclipse_config
target
.classpath
.project
+ target
local
.*
nbproject
*.ipr
*.iws
*.iml
eclipse_config
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Cheese.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Cheese.java 2010-09-08 02:20:07 UTC (rev 35052)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Cheese.java 2010-09-08 02:28:14 UTC (rev 35053)
@@ -16,22 +16,6 @@
package org.test;
-/*
- * 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.
- */
-
public class Cheese {
private String type;
private int price;
@@ -58,4 +42,4 @@
this.price = price;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Person.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Person.java 2010-09-08 02:20:07 UTC (rev 35052)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/java/org/test/Person.java 2010-09-08 02:28:14 UTC (rev 35053)
@@ -16,22 +16,6 @@
package org.test;
-/*
- * 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.
- */
-
public class Person {
private String name;
private String likes;
@@ -150,4 +134,4 @@
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-09-08 02:20:07 UTC (rev 35052)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-09-08 02:28:14 UTC (rev 35053)
@@ -190,6 +190,7 @@
org.drools,org.drools.core,${ignore.drools.version}
org.drools,org.drools.flow.core,${ignore.drools.version}
org.drools,org.drools.compiler,${ignore.drools.version}
+org.drools,org.drools.flow.compiler,${ignore.drools.version}
org.drools,org.drools.templates,${ignore.drools.version}
org.drools,org.drools.decisiontables,${ignore.drools.version}
org.drools,org.drools.bpmn2,${ignore.drools.version}
Property changes on: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2
___________________________________________________________________
Name: svn:ignore
- target
.settings
.project
+ target
local
.*
nbproject
*.ipr
*.iws
*.iml
More information about the jboss-svn-commits
mailing list