[jboss-svn-commits] JBL Code SVN: r13593 - in labs/jbossrules/branches/mvel-tooling-2007-06-30: documentation/manual/en/Chapter-Install and 24 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 17 23:57:31 EDT 2007
Author: pombredanne
Date: 2007-07-17 23:57:31 -0400 (Tue, 17 Jul 2007)
New Revision: 13593
Added:
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dsl
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dslr
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/repository.xml
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.jar
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom
Removed:
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre4/
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.jar
labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom
Modified:
labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Install/Section-Install.xml
labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Comments.xml
labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml
labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/field_constraints.vsd
labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/pattern.vsd
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.project
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/JBRMS.launch
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/redeploy_appserver.sh
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/resources/RepoBinPackage.pkg
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml
Log:
Ported r13536 from trunk to branch mvel-tooling-2007-06-30
- includes an update to MVEL based on trunk at r723 (unofficial mvel14-12.pre5.1
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Install/Section-Install.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Install/Section-Install.xml 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Install/Section-Install.xml 2007-07-18 03:57:31 UTC (rev 13593)
@@ -124,12 +124,15 @@
<para>If you don't have GEF installed, you can install it using the
built in update mechanism (or downloading GEF from the eclipse.org
- website). JBoss IDE has GEF already, as do many other "distributions" of
+ website not recommended). JBoss IDE has GEF already, as do many other "distributions" of
Eclipse, so this step may be redundant for some people.</para>
<para>First you open the Help->Software updates->Find and install
from the help menu. Then you choose the Calisto update site:</para>
+ <para>If you aren't using Calisto you can use the following update site do download GEF</para>
+ <programlisting>http://europa-mirror1.eclipse.org/tools/gef/update-site/releases/</programlisting>
+
<screenshot>
<mediaobject>
<imageobject>
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Comments.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Comments.xml 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Comments.xml 2007-07-18 03:57:31 UTC (rev 13593)
@@ -2,8 +2,13 @@
<section>
<title>Comments</title>
+ <note>
+ <para><replaceable>(updated to Drools 4.0)</replaceable></para>
+ </note>
+
<para>Comments are sections of text that are ignored by the rule engine.
- They are effectively stripped out when they are encountered. </para>
+ They are stripped out when they are encountered, except inside semantic code
+ blocks, like the RHS of a rule.</para>
<section>
<title>Single line comment</title>
@@ -24,7 +29,20 @@
</mediaobject>
</figure>
- <para></para>
+ <para>To create single line comments, you can use either '#' or '//'. The
+ parser will ignore anything in the line after the comment symbol.
+ Example:</para>
+
+ <programlisting>rule "Testing Comments"
+when
+ # this is a single line comment
+ // this is also a single line comment
+ eval( true ) # this is a comment in the same line of a pattern
+then
+ // this is a comment inside a semantic code block
+ # this is another comment in a semantic code block
+end
+</programlisting>
</section>
<section>
@@ -46,7 +64,17 @@
</mediaobject>
</figure>
- <para></para>
+ <para>Multi-line comments are used to comment blocks of text, both in and
+ outside semantic code blocks. Example:</para>
+
+ <programlisting>rule "Test Multi-line Comments"
+when
+ /* this is a multi-line comment
+ in the left hand side of a rule */
+ eval( true )
+then
+ /* and this is a multi-line comment
+ in the right hand side of a rule */
+end </programlisting>
</section>
-
</section>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml 2007-07-18 03:57:31 UTC (rev 13593)
@@ -2,47 +2,76 @@
<section>
<title>Overview</title>
- <para>Drools 3 has a "native" rule language that is non XML textual format.
- This format is very light in terms of punctuation, and supports natural and
- domain specific languages via "expanders" that allow the language to morph
- to your problem domain. This chapter is mostly concered with the native rule
- format. The Diagrams used are known as "rail road" diagrams, and are
- basically flow charts for the language terms. For the technically very keen,
- you can also refer to "drl.g" which is the Antlr3 grammar for the rule
- language. If you use the Rule Workbench, a lot of the rule structure is done
- for you with content assistance, for example, type "ru" and press
- ctrl+space, and it will build the rule structure for you.</para>
+ <note>
+ <para><replaceable>(updated to Drools 4.0)</replaceable></para>
+ </note>
+ <para>Drools 4.0 has a "native" rule language that is non XML textual
+ format. This format is very light in terms of punctuation, and supports
+ natural and domain specific languages via "expanders" that allow the
+ language to morph to your problem domain. This chapter is mostly concered
+ with the native rule format. The Diagrams used are known as "rail road"
+ diagrams, and are basically flow charts for the language terms. For the
+ technically very keen, you can also refer to "DRL.g" which is the Antlr3
+ grammar for the rule language. If you use the Rule Workbench, a lot of the
+ rule structure is done for you with content assistance, for example, type
+ "ru" and press ctrl+space, and it will build the rule structure for
+ you.</para>
+
<section>
<title>A rule file</title>
<para>A rule file is typically a file with a .drl extension. In a drl file
- you can have multiple rules, functions etc. However, you are also able to
+ you can have multiple rules, queries and functions, as well as some
+ resource declarations like imports, globals and attributes that are
+ assigned and used by your rules and queries. However, you are also able to
spread your rules across multiple rule files (in that case, the extension
.rule is suggested, but not required) - spreading rules across files can
help with managing large numbers of rules. A DRL file is simply a text
file.</para>
+
+ <para>The overal structure of a rule file is:</para>
+
+ <example>
+ <title>Rules file</title>
+
+ <programlisting><emphasis role="bold">package </emphasis><replaceable>package-name</replaceable>
+
+<replaceable>imports</replaceable>
+
+<replaceable>globals</replaceable>
+
+<replaceable>functions</replaceable>
+
+<replaceable>queries</replaceable>
+
+<replaceable>rules</replaceable>
+</programlisting>
+ </example>
+
+ <para>The order in which the elements are declared is not important,
+ except for the package name that, if declared, must be the first element
+ in the rules file. All elements are optional, so you will use only those
+ you need. We will discuss each of them in the following sections.</para>
</section>
<section>
<title>What makes a rule</title>
- <para>A rule has the following rough structure:<literallayout>
-rule "name"
- ATTRIBUTES
- when
- LHS
- then
- RHS
-end
-</literallayout>Its really that simple. Mostly punctuation is not needed, even
- the double quotes for "name" are optional, as are newlines. ATTRIBUTES are
- simple (always optional) hints to how the rule should behave. LHS is the
- conditional parts of the rule, which follows a certain syntax which is
- covered below. RHS is basically a block that allows Java semantic code to
- be executed (this will soon support other semantic languages, like groovy,
- and C#). The only special keywords here are for asserting, retracting or
- modifying facts. Any variables bound in the LHS are available here.</para>
+ <para>For the impatients, just as an early view, a rule has the following
+ rough structure:<programlisting><emphasis role="bold">rule</emphasis> <replaceable>"name"</replaceable>
+ <replaceable>attributes</replaceable>
+ <emphasis role="bold">when</emphasis>
+ <replaceable>LHS</replaceable>
+ <emphasis role="bold">then</emphasis>
+ <replaceable>RHS</replaceable>
+<emphasis role="bold">end</emphasis>
+</programlisting>Its really that simple. Mostly punctuation is not needed,
+ even the double quotes for "name" are optional, as are newlines.
+ Attributes are simple (always optional) hints to how the rule should
+ behave. LHS is the conditional parts of the rule, which follows a certain
+ syntax which is covered below. RHS is basically a block that allows
+ dialect specific semantic code to be executed.</para>
<para>It is important to note that whitepace is not important, EXCEPT in
thse case of domain specific languages, in which case each line is
@@ -51,60 +80,199 @@
</section>
<section>
- <title>Domain Specific Languages</title>
-
- <para>Domain specific languages are implemented as an enhancement over the
- native rule language. They use the "expander" mechanism. The expander
- mechanism is an extensible API, but by default it can work with .dsl
- files, which contain mappings from the domain or natural language to the
- rule language and your domain objects. You can think of these .dsl files
- also as a mapping to your domain model (which provides you with some
- insulation). DSLs/expanders work by processing a line in the rule source
- as it is being compiled - this is the only time that newlines are
- significant. This is done to aid readability and avoid the need for
- punctuation. It is expected that over time, alternative expanders and DSLs
- will be available/prebuilt for various domains, and provide other forms of
- natural language parsing and analysis. It is up to you if you believe a
- DSL is of benefit to your application - they certainly make for very nice
- looking rules, but for some folks, the native rule language is ideal.
- Freedom is good.</para>
- </section>
-
- <section>
<title>Reserved words</title>
<para>There are some reserved keywords that are used in the rule language.
It is wise to avoid collisions with these words when naming your domain
- objects, properties, methods, functions and so on that are used in the
- rule text. The following list are words that you should try and avoid in
- the rule contents if possible (often times it will work fine, but in some
- cases the rules may be parsed incorrectly). Of course, you can have words
- as part of a method name in camel case, like notSomething() - there are no
- issues with that scenario.</para>
+ objects, properties, methods, functions and other elements that are used
+ in the rule text. The parser is a bit smart and sometimes knows when a
+ keyword is not being used as a keyword, but avoiding the use of them might
+ prevent some headaches.</para>
- <literallayout>
-when
-then
-rule
-end
-contains
-matches
-and
-or
-modify
-retract
-assert
-salience
-function
-query
-exists
-eval
-agenda-group
-no-loop
-duration
-->
-not
-auto-focus
-</literallayout>
+ <para>The following is a list of keywords that must be avoided as
+ identifiers when writing rules:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>rule</para>
+ </listitem>
+
+ <listitem>
+ <para>query</para>
+ </listitem>
+
+ <listitem>
+ <para>when</para>
+ </listitem>
+
+ <listitem>
+ <para>then</para>
+ </listitem>
+
+ <listitem>
+ <para>end</para>
+ </listitem>
+
+ <listitem>
+ <para>null</para>
+ </listitem>
+
+ <listitem>
+ <para>and</para>
+ </listitem>
+
+ <listitem>
+ <para>or</para>
+ </listitem>
+
+ <listitem>
+ <para>not</para>
+ </listitem>
+
+ <listitem>
+ <para>exists</para>
+ </listitem>
+
+ <listitem>
+ <para>collect</para>
+ </listitem>
+
+ <listitem>
+ <para>accumulate</para>
+ </listitem>
+
+ <listitem>
+ <para>from</para>
+ </listitem>
+
+ <listitem>
+ <para>forall</para>
+ </listitem>
+
+ <listitem>
+ <para>true</para>
+ </listitem>
+
+ <listitem>
+ <para>false</para>
+ </listitem>
+
+ <listitem>
+ <para>eval</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The following list are keywords that you should try and avoid in the
+ rule contents if possible, but the parser usually will work fine, even if
+ you use them for something else.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>package</para>
+ </listitem>
+
+ <listitem>
+ <para>function</para>
+ </listitem>
+
+ <listitem>
+ <para>global</para>
+ </listitem>
+
+ <listitem>
+ <para>import</para>
+ </listitem>
+
+ <listitem>
+ <para>template</para>
+ </listitem>
+
+ <listitem>
+ <para>attributes</para>
+ </listitem>
+
+ <listitem>
+ <para>enabled</para>
+ </listitem>
+
+ <listitem>
+ <para>salience</para>
+ </listitem>
+
+ <listitem>
+ <para>duration</para>
+ </listitem>
+
+ <listitem>
+ <para>init</para>
+ </listitem>
+
+ <listitem>
+ <para>action</para>
+ </listitem>
+
+ <listitem>
+ <para>reverse</para>
+ </listitem>
+
+ <listitem>
+ <para>result</para>
+ </listitem>
+
+ <listitem>
+ <para>contains</para>
+ </listitem>
+
+ <listitem>
+ <para>excludes</para>
+ </listitem>
+
+ <listitem>
+ <para>memberOf</para>
+ </listitem>
+
+ <listitem>
+ <para>matches</para>
+ </listitem>
+
+ <listitem>
+ <para>in</para>
+ </listitem>
+
+ <listitem>
+ <para>date-effective</para>
+ </listitem>
+
+ <listitem>
+ <para>date-expires</para>
+ </listitem>
+
+ <listitem>
+ <para>no-loop</para>
+ </listitem>
+
+ <listitem>
+ <para>auto-focus</para>
+ </listitem>
+
+ <listitem>
+ <para>activation-group</para>
+ </listitem>
+
+ <listitem>
+ <para>agenda-group</para>
+ </listitem>
+
+ <listitem>
+ <para>dialect</para>
+ </listitem>
+
+ <listitem>
+ <para>rule-flow-group</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Of course, you can have words as part of a method name in camel
+ case, like notSomething() - there are no issues with that scenario.</para>
</section>
</section>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/field_constraints.vsd
===================================================================
(Binary files differ)
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/pattern.vsd
===================================================================
(Binary files differ)
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,18 +1,18 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre4/mvel14-1.2pre4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre5.1/mvel14-1.2pre5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -102,25 +102,25 @@
/**
* @param key the key to set
*/
- public void setMappingKey(final String key) {
- this.key = key;
+ public void setMappingKey(String key) {
+ this.key = key = key.trim();
if ( key != null ) {
int substr = 0;
// escape '$' to avoid errors
final Matcher m = varFinder.matcher( key.replaceAll( "\\$",
- "\\\\\\$" ) );
+ "\\\\\\$" ) );
// retrieving variables list and creating key pattern
final StringBuffer buf = new StringBuffer();
int counter = 1;
- if( ! key.startsWith( "^" ) ) {
+ if ( !key.startsWith( "^" ) ) {
// making it start with a space char or a line start
buf.append( "(\\W|^)" );
substr += buf.length();
counter++;
}
-
+
while ( m.find() ) {
if ( this.variables == Collections.EMPTY_MAP ) {
this.variables = new HashMap( 2 );
@@ -131,7 +131,7 @@
m.group( 1 ) + "(.*?)" );
}
m.appendTail( buf );
-
+
// if pattern ends with a variable, append a line end to avoid multiple line matching
if ( buf.toString().endsWith( "(.*?)" ) ) {
buf.append( "$" );
@@ -140,12 +140,13 @@
}
// setting the key pattern and making it space insensitive
- String pat = buf.toString().replaceAll( "\\s+",
- "\\\\s*" );
+ String pat = buf.toString();
if ( pat.substring( substr ).trim().startsWith( "-" ) && (!pat.substring( substr ).trim().startsWith( "-\\s*" )) ) {
pat = pat.substring( 0,
- pat.indexOf( '-' ) + 1 ) + "\\s*" + pat.substring( pat.indexOf( '-' ) + 1 );
+ pat.indexOf( '-' ) + 1 ) + "\\s*" + pat.substring( pat.indexOf( '-' ) + 1 ).trim();
}
+ pat = pat.replaceAll( "\\s+",
+ "\\\\s+" );
this.keyPattern = Pattern.compile( pat,
Pattern.DOTALL | Pattern.MULTILINE );
@@ -179,7 +180,7 @@
final int pos = ((Integer) entry.getValue()).intValue();
this.valuePattern = this.valuePattern.replaceAll( "\\{" + var + "\\}",
- "\\$" + pos );
+ "\\$" + pos );
}
}
}
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -29,7 +29,7 @@
return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
config );
}
-
+
public void testWithExpanderDSL() throws Exception {
final PackageBuilder builder = new PackageBuilder();
final Reader source = new InputStreamReader( getClass().getResourceAsStream( "rule_with_expander_dsl.drl" ) );
@@ -55,9 +55,9 @@
final WorkingMemory wm = ruleBase.newStatefulSession();
wm.insert( new Person( "Bob",
- "http://foo.bar" ) );
+ "http://foo.bar" ) );
wm.insert( new Cheese( "stilton",
- 42 ) );
+ 42 ) );
final List messages = new ArrayList();
wm.setGlobal( "messages",
@@ -95,7 +95,7 @@
final WorkingMemory wm = ruleBase.newStatefulSession();
wm.insert( new Person( "rage" ) );
wm.insert( new Cheese( "cheddar",
- 15 ) );
+ 15 ) );
final List messages = new ArrayList();
wm.setGlobal( "messages",
@@ -114,15 +114,15 @@
messages.size() );
wm.insert( new Cheese( "brie",
- 15 ) );
+ 15 ) );
wm.fireAllRules();
// YOUR FIRED
assertEquals( 1,
- messages.size() );
- }
-
+ messages.size() );
+ }
+
public void testEmptyDSL() throws Exception {
final String DSL = "# This is an empty dsl file.";
final PackageBuilder builder = new PackageBuilder();
@@ -134,5 +134,45 @@
final Package pkg = builder.getPackage();
assertFalse( pkg.isValid() );
- }
+ }
+
+ public void testDSLWithIndividualConstraintMappings() throws Exception {
+ final PackageBuilder builder = new PackageBuilder();
+ final Reader source = new InputStreamReader( getClass().getResourceAsStream( "test_dslWithIndividualConstraints.dslr" ) );
+ final Reader dsl = new InputStreamReader( getClass().getResourceAsStream( "test_dslWithIndividualConstraints.dsl" ) );
+ builder.addPackageFromDrl( source,
+ dsl );
+
+ // the compiled package
+ final Package pkg = builder.getPackage();
+ assertTrue( pkg.getErrorSummary(),
+ pkg.isValid() );
+ assertEquals( pkg.getErrorSummary(),
+ null,
+ pkg.getErrorSummary() );
+ // Check errors
+ assertEquals( 0,
+ builder.getErrors().getErrors().length );
+
+ final RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg );
+
+ final WorkingMemory wm = ruleBase.newStatefulSession();
+ List results = new ArrayList();
+ wm.setGlobal( "results",
+ results );
+ Cheese cheese = new Cheese( "stilton",
+ 42 );
+ wm.insert( cheese );
+
+ wm.fireAllRules();
+
+ // should have fired
+ assertEquals( 1,
+ results.size() );
+ assertEquals( cheese,
+ results.get( 0 ) );
+
+ }
+
}
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -25,7 +25,7 @@
final String inputKey = "The Customer name is {name} and surname is {surname} and it has US$ 50,00 on his {pocket}";
final String inputValue = "Customer( name == \"{name}\", surname == \"{surname}\", money > $money )";
- final String expectedKeyP = "(\\W|^)The\\s*Customer\\s*name\\s*is\\s*(.*?)\\s*and\\s*surname\\s*is\\s*(.*?)\\s*and\\s*it\\s*has\\s*US\\$\\s*50,00\\s*on\\s*his\\s*(.*?)$";
+ final String expectedKeyP = "(\\W|^)The\\s+Customer\\s+name\\s+is\\s+(.*?)\\s+and\\s+surname\\s+is\\s+(.*?)\\s+and\\s+it\\s+has\\s+US\\$\\s+50,00\\s+on\\s+his\\s+(.*?)$";
final String expectedValP = "Customer( name == \"$2\", surname == \"$3\", money > \\$money )";
final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
@@ -48,7 +48,7 @@
final String inputKey = "-name is {name}";
final String inputValue = "name == \"{name}\"";
- final String expectedKeyP = "(\\W|^)-\\s*name\\s*is\\s*(.*?)$";
+ final String expectedKeyP = "(\\W|^)-\\s*name\\s+is\\s+(.*?)$";
final String expectedValP = "name == \"$2\"";
final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
@@ -71,7 +71,7 @@
final String inputKey = "- name is {name}";
final String inputValue = "name == \"{name}\"";
- final String expectedKeyP = "(\\W|^)-\\s*name\\s*is\\s*(.*?)$";
+ final String expectedKeyP = "(\\W|^)-\\s*name\\s+is\\s+(.*?)$";
final String expectedValP = "name == \"$2\"";
final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
@@ -81,7 +81,8 @@
assertEquals( inputKey,
entry.getMappingKey() );
- assertEquals( expectedKeyP,
+ assertEquals( entry.getKeyPattern().pattern(),
+ expectedKeyP,
entry.getKeyPattern().pattern() );
assertEquals( inputValue,
entry.getMappingValue() );
@@ -132,4 +133,65 @@
assertEquals( "SomeFact(value==\" bl ah \")",
result );
}
+
+ public void testExpandWithDots() {
+ final String inputKey = "- {prop} is {val} ";
+ final String inputValue = "{prop} == {val}";
+
+ this.entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+ null,
+ inputKey,
+ inputValue );
+
+ String result = this.entry.getKeyPattern().matcher( "- type is ClientServiceType.TypeGOLD" ).replaceAll( this.entry.getValuePattern() );
+ assertEquals( result,
+ "type == ClientServiceType.TypeGOLD",
+ result );
+ }
+
+ public void testExpandPartialWords() {
+ final String inputKey = "- {prop} is {val} ";
+ final String inputValue = "{prop} == {val}";
+
+ this.entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+ null,
+ inputKey,
+ inputValue );
+ // not supposed to expand
+ String result = this.entry.getKeyPattern().matcher( "- type is_not ClientServiceType.TypeGOLD" ).replaceAll( this.entry.getValuePattern() );
+ assertEquals( result,
+ "- type is_not ClientServiceType.TypeGOLD",
+ result );
+ }
+
+ public void testExpandPartialWords2() {
+ final String inputKey = "- {prop} is_not {val} ";
+ final String inputValue = "{prop} != {val}";
+
+ this.entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+ null,
+ inputKey,
+ inputValue );
+
+ String result = this.entry.getKeyPattern().matcher( "- type is_not ClientServiceType.TypeGOLD" ).replaceAll( this.entry.getValuePattern() );
+ assertEquals( result,
+ "type != ClientServiceType.TypeGOLD",
+ result );
+ }
+
+ public void testExpandPartialWords3() {
+ final String inputKey = "- {prop} is not {val} ";
+ final String inputValue = "{prop} != {val}";
+
+ this.entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+ null,
+ inputKey,
+ inputValue );
+
+ String result = this.entry.getKeyPattern().matcher( "- type is not ClientServiceType.TypeGOLD" ).replaceAll( this.entry.getValuePattern() );
+ assertEquals( result,
+ "type != ClientServiceType.TypeGOLD",
+ result );
+ }
+
}
Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dsl (from rev 13579, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dsl)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dsl (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dsl 2007-07-18 03:57:31 UTC (rev 13593)
@@ -0,0 +1,2 @@
+[when] There is a {type} named {name} = {name} : {type}()
+[when] - {prop} is {val} = {prop} == {val}
Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dslr (from rev 13579, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dslr)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dslr (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/test_dslWithIndividualConstraints.dslr 2007-07-18 03:57:31 UTC (rev 13593)
@@ -0,0 +1,13 @@
+package org.drools
+
+global java.util.List results
+
+expander test_dslWithIndividualConstraints.dsl
+
+rule "Bug with dot reduction"
+when
+ There is a Cheese named cs
+ - type is Cheese.STILTON
+then
+ >results.add( cs );
+end
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,12 +1,12 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre4/mvel14-1.2pre4.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre5.1/mvel14-1.2pre5.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -17,7 +17,7 @@
Serializable,
Cloneable {
- private static final long serialVersionUID = 1504379613555271045L;
+ private static final long serialVersionUID = 400L;
/**
* Holds the instance of the variables.
@@ -40,6 +40,10 @@
this.localDeclarations = localDeclarations;
this.globals = globals;
}
+
+ public Map getVariableResolvers() {
+ return this.variableResolvers;
+ }
public Object getObject() {
return this.object;
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath 2007-07-18 03:57:31 UTC (rev 13593)
@@ -15,6 +15,6 @@
<classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre4/mvel14-1.2pre4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre5.1/mvel14-1.2pre5.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -102,16 +102,20 @@
if (IDroolsConstants.CACHE_PARSED_RULES.equals(event.getProperty())) {
useCachePreference = ((Boolean) event.getNewValue()).booleanValue();
if (!useCachePreference) {
- parsedRules.clear();
- compiledRules.clear();
- ruleInfoByClassNameMap.clear();
- functionInfoByClassNameMap.clear();
+ clearCache();
}
}
}
});
}
+
+ public void clearCache() {
+ parsedRules.clear();
+ compiledRules.clear();
+ ruleInfoByClassNameMap.clear();
+ functionInfoByClassNameMap.clear();
+ }
/**
* This method is called when the plug-in is stopped
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -85,6 +85,7 @@
protected void fullBuild(IProgressMonitor monitor)
throws CoreException {
+ DroolsEclipsePlugin.getDefault().clearCache();
getProject().accept(new DroolsBuildVisitor());
}
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/util/ProjectClassLoader.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -5,7 +5,10 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IFile;
@@ -65,6 +68,7 @@
List pathElements = new ArrayList();
try {
IClasspathEntry[] paths = project.getResolvedClasspath(true);
+ Set outputPaths = new HashSet();
if (paths != null) {
for ( int i = 0; i < paths.length; i++ ) {
@@ -72,6 +76,11 @@
if (path.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
URL url = getRawLocationURL(path.getPath());
pathElements.add(url);
+ } else if (path.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+ IPath output = path.getOutputLocation();
+ if (path.getOutputLocation() != null) {
+ outputPaths.add(output);
+ }
}
}
}
@@ -79,6 +88,11 @@
IPath outputPath = location.append(project.getOutputLocation()
.removeFirstSegments(1));
pathElements.add(outputPath.toFile().toURI().toURL());
+ for (Iterator iterator = outputPaths.iterator(); iterator.hasNext(); ) {
+ IPath path = (IPath) iterator.next();
+ outputPath = location.append(path.removeFirstSegments(1));
+ pathElements.add(outputPath.toFile().toURI().toURL());
+ }
// also add classpath of required projects
String[] names = project.getRequiredProjectNames();
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath 2007-07-18 03:57:31 UTC (rev 13593)
@@ -5,53 +5,53 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" sourcepath="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar" sourcepath="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
<classpathentry kind="src" path="/drools-repository"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre5.1/mvel14-1.2pre5.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar" sourcepath="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
<classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/seam/profiles/seam-nopersistence/1.2.0.GA/seam-nopersistence-1.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre4/mvel14-1.2pre4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.project
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.project 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.project 2007-07-18 03:57:31 UTC (rev 13593)
@@ -2,10 +2,10 @@
<name>drools-jbrms</name>
<comment>A rule production system</comment>
<projects>
+ <project>drools-core</project>
+ <project>drools-compiler</project>
<project>drools-repository</project>
- <project>drools-core</project>
<project>drools-decisiontables</project>
- <project>drools-compiler</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/JBRMS.launch
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/JBRMS.launch 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/JBRMS.launch 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/drools-jbrms"/>
</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="drools-brms" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/classes" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-compiler/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="GWT_DEV" path="3" type="3"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-servlet.jar" path="3" type="3"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-user.jar" path="3" type="3"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="drools-core" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-1.5.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-attrs-1.5.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/cglib-2.1_3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-collections-3.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-fileupload-1.1.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-io-1.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-logging-1.0.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/concurrent-1.3.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/derby-10.2.1.6.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/dom4j-1.6.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jboss-seam-1.2.0.GA.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jcr-1.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jta-1.0.1B.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/lucene-core-2.0.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xercesImpl-2.4.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xml-apis-1.0.b2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xpp3-1.1.3.4.O.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xstream-1.1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="drools-compiler" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="drools-repository" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="drools-decisiontables" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jxl-2.4.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/janino-2.5.7.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/antlr-runtime-3.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-api-1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-core-1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-jcr-commons-1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-text-extractors-1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/log4j-1.2.13.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-api-1.3.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-log4j12-1.3.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/mvel14-1.2pre2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/src/main/java" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/classes" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-compiler/src/main/java" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_DEV" path="3" type="3"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-servlet.jar" path="3" type="3"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-user.jar" path="3" type="3"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-core" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-1.5.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-attrs-1.5.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/cglib-2.1_3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-collections-3.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-fileupload-1.1.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-io-1.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-logging-1.0.4.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/concurrent-1.3.4.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/derby-10.2.1.6.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/dom4j-1.6.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jboss-seam-1.2.0.GA.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jcr-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jta-1.0.1B.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/lucene-core-2.0.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xercesImpl-2.4.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xml-apis-1.0.b2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xpp3-1.1.3.4.O.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xstream-1.1.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-compiler" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-repository" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-decisiontables" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/mvel14-1.2pre2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jxl-2.4.2.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/janino-2.5.7.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/antlr-runtime-3.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-api-1.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-core-1.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-jcr-commons-1.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-text-extractors-1.3.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/log4j-1.2.13.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-api-1.3.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-log4j12-1.3.0.jar" path="3" type="2"/> "/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="drools-jbrms"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www org.drools.brms.JBRMS/JBRMS.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="drools-jbrms"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
</launchConfiguration>
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/redeploy_appserver.sh
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/redeploy_appserver.sh 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/redeploy_appserver.sh 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,4 +1,4 @@
mvn -o package -Dmaven.test.skip=true
-cp ./target/drools-jbrms.war /home/michael/apps/jbossweb-1.0.1.GA/server/default/deploy
+cp ./target/drools-jbrms.war /usr/local/share/java/jboss-4.2.0.GA/server/default/deploy
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -75,7 +75,8 @@
while ( (len = jis.read( buf )) >= 0 ) {
out.write( buf, 0, len );
}
- loader.addResource( entry.getName(), out.toByteArray() );
+
+ loader.addResource( entry.getName() , out.toByteArray() );
}
}
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -75,10 +75,5 @@
} else {
buf.append( content );
}
-
-
}
-
-
-
}
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -18,7 +18,6 @@
import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
import java.io.ObjectInputStream;
import java.util.Calendar;
import java.util.Date;
@@ -46,8 +45,6 @@
import org.drools.brms.client.rpc.TableDataRow;
import org.drools.brms.client.rpc.ValidatedResponse;
import org.drools.brms.client.rulelist.AssetItemListViewer;
-import org.drools.brms.server.contenthandler.BRLContentHandler;
-import org.drools.brms.server.contenthandler.ContentHandler;
import org.drools.brms.server.util.BRXMLPersistence;
import org.drools.brms.server.util.TableDisplayHandler;
import org.drools.brms.server.util.TestEnvironmentSessionHelper;
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,4 +1,5 @@
package org.drools.brms.server.contenthandler;
+
/*
* Copyright 2005 JBoss Inc
*
@@ -15,35 +16,40 @@
* limitations under the License.
*/
-
-
import junit.framework.TestCase;
+import org.drools.brms.server.contenthandler.DRLFileContentHandler;
public class DRLFileContentHandlerTest extends TestCase {
+
+ public void testSniffDRLType() throws Exception {
+
+ DRLFileContentHandler h = new DRLFileContentHandler();
+
+ // in this case we have package, and N rules
+ String classic = "package foobar \n rule boo \n when \n then\n end \n rule boo2 \n when \n then\n end";
- public void testSniffDRLType() throws Exception {
- //in this case we have package, and N rules
- String classic = "package foobar \n rule boo \n when \n then\n end \n rule boo2 \n when \n then\n end";
-
- //in this case we just have rules
- String moreRuleClassic = "\nrule bar \n when \n then \n end\nrule x \n when \n then \n end ";
-
- //in this case we just have a single rule
- String newRule = "agenda-group 'x' \n when \n then \n";
-
- String moreSingle = "rule foo when then end";
-
- String moreNewRule = "agenda-group 'x' \n when end.bar \n then rule.end.bar";
-
- DRLFileContentHandler h = new DRLFileContentHandler();
-
- assertTrue(h.isStandAloneRule( newRule ));
- assertFalse(h.isStandAloneRule( moreRuleClassic ));
- assertFalse(h.isStandAloneRule( classic ));
- assertFalse(h.isStandAloneRule( moreSingle ));
- assertTrue(h.isStandAloneRule( moreNewRule ));
- }
-
+ // in this case we just have rules
+ String moreRuleClassic = "\nrule bar \n when \n then \n end\nrule x \n when \n then \n end ";
+
+ // in this case we just have a single rule
+ String newRule = "agenda-group 'x' \n when \n then \n";
+
+ String moreSingle = "rule foo when then end";
+
+ String moreNewRule = "agenda-group 'x' \n when end.bar \n then rule.end.bar";
+
+ String emptyRule = "";
+
+ assertTrue(h.isStandAloneRule(newRule));
+ assertFalse(h.isStandAloneRule(moreRuleClassic));
+ assertFalse(h.isStandAloneRule(classic));
+ assertFalse(h.isStandAloneRule(moreSingle));
+ assertFalse(h.isStandAloneRule(null));
+ assertFalse(h.isStandAloneRule(emptyRule));
+ assertTrue(h.isStandAloneRule(moreNewRule));
+
+ }
+
public void testRuleWithDialect() {
String rule = "rule \"DemoRule\" \n "+
" salience 10 \n" +
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/resources/RepoBinPackage.pkg
===================================================================
(Binary files differ)
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath 2007-07-18 03:57:31 UTC (rev 13593)
@@ -16,7 +16,7 @@
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
<classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
<classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre4/mvel14-1.2pre4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre5.1/mvel14-1.2pre5.1.jar"/>
<classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
<classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
Added: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/repository.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/repository.xml (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/repository.xml 2007-07-18 03:57:31 UTC (rev 13593)
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
+<!-- Example Repository Configuration File -->
+<Repository>
+ <!--
+ virtual file system where the repository stores global state
+ (e.g. registered namespaces, custom node types, etc.)
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+ </FileSystem>
+
+ <!--
+ security configuration
+ -->
+ <Security appName="Jackrabbit">
+ <!--
+ access manager:
+ class: FQN of class implementing the AccessManager interface
+ -->
+ <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
+ <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+ </AccessManager>
+
+ <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+ <!-- anonymous user name ('anonymous' is the default value) -->
+ <param name="anonymousId" value="anonymous"/>
+ <!--
+ default user name to be used instead of the anonymous user
+ when no login credentials are provided (unset by default)
+ -->
+ <!-- <param name="defaultUserId" value="superuser"/> -->
+ </LoginModule>
+ </Security>
+
+ <!--
+ location of workspaces root directory and name of default workspace
+ -->
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ <!--
+ workspace configuration template:
+ used to create the initial workspace if there's no workspace yet
+ -->
+ <Workspace name="${wsp.name}">
+ <!--
+ virtual file system of the workspace:
+ class: FQN of class implementing the FileSystem interface
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+ <!--
+ persistence manager of the workspace:
+ class: FQN of class implementing the PersistenceManager interface
+ -->
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager">
+ <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+ <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+ </PersistenceManager>
+ <!--
+ Search index and the file system it uses.
+ class: FQN of class implementing the QueryHandler interface
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ </SearchIndex>
+ </Workspace>
+
+ <!--
+ Configures the versioning
+ -->
+ <Versioning rootPath="${rep.home}/version">
+ <!--
+ Configures the filesystem to use for versioning for the respective
+ persistence manager
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version" />
+ </FileSystem>
+
+ <!--
+ Configures the persistence manager to be used for persisting version state.
+ Please note that the current versioning implementation is based on
+ a 'normal' persistence manager, but this could change in future
+ implementations.
+ -->
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager">
+ <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
+ <param name="schemaObjectPrefix" value="version_"/>
+ </PersistenceManager>
+ </Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
+</Repository>
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/resources/node_type_definitions/rulepackage_node_type.cnd 2007-07-18 03:57:31 UTC (rev 13593)
@@ -38,3 +38,6 @@
//optionally store the binary compiled package (really a cache)
- drools:compiledPackage (binary)
+
+// use this to capture fields which are not known ahead of time
+- * (undefined)
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java 2007-07-18 03:57:31 UTC (rev 13593)
@@ -13,6 +13,9 @@
PackageItem item = repo.createPackage( "testListPackages1", "lalalala" );
assertNotNull(item.getCreator());
+
+ item.updateStringProperty( "goo", "whee" );
+ assertEquals("goo", item.getStringProperty( "whee" ));
assertFalse(item.getCreator().equals( "" ));
List list = iteratorToList( repo.listPackages() );
@@ -21,6 +24,8 @@
list = iteratorToList( repo.listPackages() );
+
+
assertEquals(prevSize + 1, list.size());
}
Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5 (from rev 13579, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre5)
Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.jar
===================================================================
(Binary files differ)
Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.jar (from rev 13579, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom
===================================================================
--- labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom 2007-07-17 17:01:18 UTC (rev 13579)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom 2007-07-18 03:57:31 UTC (rev 13593)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.mvel</groupId>
-
- <artifactId>mvel14</artifactId>
-
- <name>mvel</name>
-
- <version>1.2pre5</version>
-
- <description></description>
-
- <inceptionYear>2005</inceptionYear>
-
- <url>http://wiki.mvflex.org/index.php?title=MVFLEX_Expression_Language</url>
-
- <issueManagement>
- <url>http://jira.codehaus.org/browse/MVEL</url>
- </issueManagement>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <mailingLists/>
-
- <scm>
- <connection>scm:svn:http://svn.codehaus.org/mvel/</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/mvel/</developerConnection>
- <url>http://svn.mvel.codehaus.org/</url>
- </scm>
-
- <organization>
- <name>Codehaus</name>
- <url>http://codehaus.org</url>
- </organization>
-
- <build>
- <sourceDirectory></sourceDirectory>
- <testSourceDirectory></testSourceDirectory>
- </build>
-</project>
\ No newline at end of file
Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom (from rev 13579, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre5/mvel14-1.2pre5.pom 2007-07-18 03:57:31 UTC (rev 13593)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.mvel</groupId>
+
+ <artifactId>mvel14</artifactId>
+
+ <name>mvel</name>
+
+ <version>1.2pre5</version>
+
+ <description></description>
+
+ <inceptionYear>2005</inceptionYear>
+
+ <url>http://wiki.mvflex.org/index.php?title=MVFLEX_Expression_Language</url>
+
+ <issueManagement>
+ <url>http://jira.codehaus.org/browse/MVEL</url>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <mailingLists/>
+
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/mvel/</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/mvel/</developerConnection>
+ <url>http://svn.mvel.codehaus.org/</url>
+ </scm>
+
+ <organization>
+ <name>Codehaus</name>
+ <url>http://codehaus.org</url>
+ </organization>
+
+ <build>
+ <sourceDirectory></sourceDirectory>
+ <testSourceDirectory></testSourceDirectory>
+ </build>
+</project>
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml 2007-07-18 03:36:32 UTC (rev 13592)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml 2007-07-18 03:57:31 UTC (rev 13593)
@@ -651,7 +651,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel14</artifactId>
- <version>1.2pre4</version>
+ <version>1.2pre5.1</version>
</dependency>
<!-- drools-compiler -->
More information about the jboss-svn-commits
mailing list