Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4014 - in labs/jbossrules/trunk: . drools-compiler drools-compiler/src/main/java/org/drools/compiler drools-decisiontables drools-ide/src/main/java/org/drools/ide/wizard/project drools-jsr94
Author: mar...@jb... Date: 2006-04-30 10:43:45 -0400 (Sun, 30 Apr 2006) New Revision: 4014 Modified: labs/jbossrules/trunk/drools-compiler/.classpath labs/jbossrules/trunk/drools-compiler/pom.xml labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java labs/jbossrules/trunk/drools-decisiontables/.classpath labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/wizard/project/NewDroolsProjectWizard.java labs/jbossrules/trunk/drools-jsr94/.classpath labs/jbossrules/trunk/drools-jsr94/.project labs/jbossrules/trunk/pom.xml Log: -JCI snapshot is now on cvs.apache.org so update for that. Modified: labs/jbossrules/trunk/drools-compiler/.classpath =================================================================== --- labs/jbossrules/trunk/drools-compiler/.classpath 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-compiler/.classpath 2006-04-30 14:43:45 UTC (rev 4014) @@ -6,20 +6,23 @@ <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/> - <classpathentry kind="src" path="/drools-core"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.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/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/> <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/> + <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/> <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/jci/jci/SNAPSHOT-378493+patch4/jci-SNAPSHOT-378493+patch4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/> - <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/> + <classpathentry kind="src" path="/drools-core"/> <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/jung/jung/1.7.2/jung-1.7.2.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/> </classpath> \ No newline at end of file Modified: labs/jbossrules/trunk/drools-compiler/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-compiler/pom.xml 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-compiler/pom.xml 2006-04-30 14:43:45 UTC (rev 4014) @@ -26,24 +26,24 @@ <version>${project.version}</version> </dependency> - <!-- will keep JCI local for now. Move to ibiblio when its updated --> + <!-- will keep JCI local for now. Move to ibiblio when its updated --> <dependency> - <groupId>jci</groupId> - <artifactId>jci</artifactId> - <version>SNAPSHOT-378493+patch4</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-jci-janino</artifactId> + <version>2.4.1</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-jci-eclipse</artifactId> + <version>3.2.0.658</version> + </dependency> + + <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> <version>2.4.1</version> </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> <!-- only needed for the default expander in parser/lang.. to remove when it is refactored into another module. --> <dependency> Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java =================================================================== --- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2006-04-30 14:43:45 UTC (rev 4014) @@ -1,4 +1,5 @@ package org.drools.compiler; + /* * Copyright 2005 JBoss Inc * @@ -15,11 +16,10 @@ * limitations under the License. */ - - import java.io.IOException; import java.io.Reader; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -27,7 +27,6 @@ import org.apache.commons.jci.compilers.CompilationResult; import org.apache.commons.jci.compilers.JavaCompiler; import org.apache.commons.jci.compilers.JavaCompilerFactory; -import org.apache.commons.jci.readers.MemoryResourceReader; import org.apache.commons.jci.readers.ResourceReader; import org.apache.commons.jci.stores.ResourceStore; import org.drools.lang.descr.FunctionDescr; @@ -45,15 +44,15 @@ import org.xml.sax.SAXException; public class PackageBuilder { - private JavaCompiler compiler; + private JavaCompiler compiler; - private Package pkg; + private Package pkg; - private List results; + private List results; - private PackageStore packageStoreWrapper; + private PackageStore packageStoreWrapper; - private MemoryResourceReader src; + private MemoryResourceReader src; private PackageBuilderConfiguration configuration; @@ -72,21 +71,20 @@ if ( configuration == null ) { configuration = new PackageBuilderConfiguration(); } - - this.compiler = JavaCompilerFactory.getInstance().createCompiler( configuration.getCompiler() ); - - this.configuration = configuration; - + + this.compiler = getCompiler( configuration.getCompiler() ); + + this.configuration = configuration; + this.src = new MemoryResourceReader(); this.results = new ArrayList(); this.pkg = pkg; - if ( pkg != null ) { this.packageStoreWrapper = new PackageStore( pkg.getPackageCompilationData() ); - } + } } /** @@ -95,20 +93,22 @@ * @throws DroolsParserException * @throws IOException */ - public void addPackageFromDrl(Reader reader) throws DroolsParserException, IOException { + public void addPackageFromDrl(Reader reader) throws DroolsParserException, + IOException { DrlParser parser = new DrlParser(); PackageDescr pkg = parser.parse( reader ); this.results.addAll( parser.getErrors() ); addPackage( pkg ); } - + /** * Load a rule package from XML source. * @param reader * @throws DroolsParserException * @throws IOException */ - public void addPackageFromXml(Reader reader) throws DroolsParserException, IOException { + public void addPackageFromXml(Reader reader) throws DroolsParserException, + IOException { XmlPackageReader xmlReader = new XmlPackageReader(); try { @@ -118,7 +118,7 @@ } addPackage( xmlReader.getPackageDescr() ); - } + } /** * Load a rule package from DRL source using the supplied DSL configuration. @@ -128,20 +128,22 @@ * @throws IOException */ public void addPackageFromDrl(Reader source, - Reader dsl) throws DroolsParserException, IOException { + Reader dsl) throws DroolsParserException, + IOException { DrlParser parser = new DrlParser(); - PackageDescr pkg = parser.parse( source, dsl ); + PackageDescr pkg = parser.parse( source, + dsl ); this.results.addAll( parser.getErrors() ); addPackage( pkg ); - } - + } + public void addPackage(PackageDescr packageDescr) { - if (packageDescr.getName() == null || "".equals(packageDescr.getName())) { - - throw new MissingPackageNameException("Missing package name for rule package."); + if ( packageDescr.getName() == null || "".equals( packageDescr.getName() ) ) { + + throw new MissingPackageNameException( "Missing package name for rule package." ); } - + if ( this.pkg != null ) { //mergePackage( packageDescr ) ; mergePackage( this.pkg, @@ -192,7 +194,7 @@ try { clazz = typeResolver.resolveType( className ); pkg.addGlobal( identifier, - clazz ); + clazz ); } catch ( ClassNotFoundException e ) { new GlobalError( identifier ); } @@ -203,9 +205,9 @@ String text, MemoryResourceReader src, ResourceStore dst) { - src.addFile( className.replace( '.', - '/' ) + ".java", - text.toCharArray() ); + src.add( className.replace( '.', + '/' ) + ".java", + text.getBytes() ); CompilationResult result = compiler.compile( new String[]{className}, src, dst, @@ -217,15 +219,16 @@ private void addFunction(FunctionDescr functionDescr) { FunctionBuilder buidler = new FunctionBuilder(); CompilationResult result = compile( this.pkg.getName() + "." + ucFirst( functionDescr.getName() ), - buidler.build( this.pkg, functionDescr ), + buidler.build( this.pkg, + functionDescr ), src, this.packageStoreWrapper ); - + if ( result.getErrors().length > 0 ) { this.results.add( new FunctionError( functionDescr, result.getErrors(), "Function Compilation error" ) ); - } + } } private void addRule(RuleDescr ruleDescr) { @@ -247,16 +250,17 @@ // Check if there is any code to compile. If so compile it. if ( builder.getRuleClass() != null ) { - compileRule( builder, - rule, + compileRule( builder, + rule, ruleDescr ); } - this.pkg.addRule( rule ); } - - public void compileRule(RuleBuilder builder, Rule rule, RuleDescr ruleDescr) { + + public void compileRule(RuleBuilder builder, + Rule rule, + RuleDescr ruleDescr) { // The compilation result is for th entire rule, so difficult to associate with any descr CompilationResult result = compile( this.pkg.getName() + "." + ruleDescr.getClassName(), builder.getRuleClass(), @@ -269,10 +273,10 @@ result.getErrors(), "Rule Compilation error" ) ); } else { - + for ( Iterator it = builder.getInvokers().keySet().iterator(); it.hasNext(); ) { String className = (String) it.next(); - + // Check if an invoker - returnvalue, predicate, eval or consequence has been associated // If so we add it to the PackageCompilationData as it will get wired up on compilation Object invoker = builder.getInvokerLookups().get( className ); @@ -281,14 +285,14 @@ invoker ); } String text = (String) builder.getInvokers().get( className ); - + //System.out.println( className + ":\n" + text ); - + result = compile( className, text, src, this.packageStoreWrapper ); - + if ( result.getErrors().length > 0 ) { PatternDescr descr = (PatternDescr) builder.getDescrLookups().get( className ); this.results.add( new RuleError( rule, @@ -296,8 +300,8 @@ result.getErrors(), "Rule Compilation error for Invoker" ) ); } - } - } + } + } } /** @@ -308,7 +312,7 @@ * Compiled packages are serializable. */ public Package getPackage() { - if (hasErrors()) { + if ( hasErrors() ) { this.pkg.setError( this.printErrors() ); } return this.pkg; @@ -334,12 +338,12 @@ StringBuffer buf = new StringBuffer(); for ( Iterator iter = this.results.iterator(); iter.hasNext(); ) { DroolsError err = (DroolsError) iter.next(); - buf.append(err.getMessage()); + buf.append( err.getMessage() ); buf.append( "\n" ); } return buf.toString(); } - + /** * Takes a given name and makes sure that its legal and doesn't already exist. If the file exists it increases counter appender untill it is unique. * @@ -353,7 +357,8 @@ String ext, ResourceReader src) { // replaces all non alphanumeric or $ chars with _ - String newName = "Rule_" + name.replaceAll( "[^\\w$]", "_" ); + String newName = "Rule_" + name.replaceAll( "[^\\w$]", + "_" ); // make sure the class name does not exist, if it does increase the counter int counter = -1; @@ -374,6 +379,16 @@ return newName; } + private JavaCompiler getCompiler(int compiler) { + switch ( compiler ) { + case PackageBuilderConfiguration.JANINO : + return JavaCompilerFactory.getInstance().createCompiler( "janino" ); + case PackageBuilderConfiguration.ECLIPSE : + default : + return JavaCompilerFactory.getInstance().createCompiler( "eclipse" ); + } + } + private String ucFirst(String name) { return name.toUpperCase().charAt( 0 ) + name.substring( 1 ); } @@ -381,9 +396,49 @@ public static class MissingPackageNameException extends IllegalArgumentException { public MissingPackageNameException(String message) { - super(message); + super( message ); } - + } + public class MemoryResourceReader implements ResourceReader { + + private Map resources; + + public boolean isAvailable(final String pResourceName) { + if (resources == null) { + return false; + } + + return resources.containsKey( pResourceName ); + } + + public void add(final String pResourceName, final byte[] pContent) { + if (resources == null) { + resources = new HashMap(); + } + + resources.put(pResourceName, pContent); + } + + public void remove(final String pResourceName) { + if (resources != null) { + resources.remove(pResourceName); + } + } + + + public byte[] getBytes(final String pResourceName) + { + return (byte[]) resources.get(pResourceName); + } + + public String[] list() { + if (resources == null) { + return new String[0]; + } + return (String[]) resources.keySet().toArray(new String[resources.size()]); + } + } + } \ No newline at end of file Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java =================================================================== --- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2006-04-30 14:43:45 UTC (rev 4014) @@ -30,8 +30,8 @@ * The valid values are "ECLIPSE" and "JANINO" only. */ public class PackageBuilderConfiguration { - public static final int ECLIPSE = JavaCompilerFactory.ECLIPSE; - public static final int JANINO = JavaCompilerFactory.JANINO; + public static final int ECLIPSE = 0; + public static final int JANINO = 1; /** This will be only setup once. It tries to look for a system property */ private static final int CONFIGURED_COMPILER = getDefaultCompiler(); @@ -59,10 +59,10 @@ public void setCompiler(int compiler) { switch ( compiler ) { case PackageBuilderConfiguration.ECLIPSE : - this.compiler = JavaCompilerFactory.ECLIPSE; + this.compiler = PackageBuilderConfiguration.ECLIPSE; break; case PackageBuilderConfiguration.JANINO : - this.compiler = JavaCompilerFactory.JANINO; + this.compiler = PackageBuilderConfiguration.JANINO; break; default : throw new RuntimeDroolsException( "value '" + compiler + "' is not a valid compiler" ); Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath =================================================================== --- labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-04-30 14:43:45 UTC (rev 4014) @@ -5,23 +5,26 @@ <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/jci/jci/SNAPSHOT-378493+patch4/jci-SNAPSHOT-378493+patch4.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/> + <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/> + <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> + <classpathentry kind="src" path="/drools-compiler"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/> + <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.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/jung/jung/1.7.2/jung-1.7.2.jar"/> - <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/> <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr3/3.0ea8/antlr3-3.0ea8.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> - <classpathentry kind="var" path="M2_REPO/eclipse/jdtcore/3.2.0.v_658/jdtcore-3.2.0.v_658.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/> + <classpathentry kind="src" path="/drools-core"/> <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> - <classpathentry kind="src" path="/drools-compiler"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/> - <classpathentry kind="src" path="/drools-core"/> - <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> </classpath> \ No newline at end of file Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/wizard/project/NewDroolsProjectWizard.java =================================================================== --- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/wizard/project/NewDroolsProjectWizard.java 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/wizard/project/NewDroolsProjectWizard.java 2006-04-30 14:43:45 UTC (rev 4014) @@ -210,8 +210,8 @@ private void addSourceFolders(IJavaProject project, IProgressMonitor monitor) throws JavaModelException, CoreException { List list = new ArrayList(); list.addAll(Arrays.asList(project.getRawClasspath())); - addSourceFolder(project, list, "src/java", monitor); - addSourceFolder(project, list, "src/rules", monitor); + addSourceFolder(project, list, "src/main/java", monitor); + addSourceFolder(project, list, "src/main/rules", monitor); project.setRawClasspath((IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]), null); } Modified: labs/jbossrules/trunk/drools-jsr94/.classpath =================================================================== --- labs/jbossrules/trunk/drools-jsr94/.classpath 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-jsr94/.classpath 2006-04-30 14:43:45 UTC (rev 4014) @@ -4,26 +4,29 @@ <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/> <classpathentry kind="output" path="target/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/drools-core"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/> - <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> - <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/> <classpathentry kind="src" path="/drools-compiler"/> - <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/eclipse/jdtcore/3.2.0.v_658/jdtcore-3.2.0.v_658.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/> <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/> + <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/> <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr3/3.0ea8/antlr3-3.0ea8.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.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/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.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/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/> - <classpathentry kind="var" path="M2_REPO/jci/jci/SNAPSHOT-378493+patch4/jci-SNAPSHOT-378493+patch4.jar"/> - <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.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/janino/janino/2.4.1/janino-2.4.1.jar"/> <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.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/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/> </classpath> \ No newline at end of file Modified: labs/jbossrules/trunk/drools-jsr94/.project =================================================================== --- labs/jbossrules/trunk/drools-jsr94/.project 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/drools-jsr94/.project 2006-04-30 14:43:45 UTC (rev 4014) @@ -2,8 +2,8 @@ <name>drools-jsr94</name> <comment/> <projects> + <project>drools-compiler</project> <project>drools-core</project> - <project>drools-compiler</project> </projects> <buildSpec> <buildCommand> Modified: labs/jbossrules/trunk/pom.xml =================================================================== --- labs/jbossrules/trunk/pom.xml 2006-04-30 14:39:20 UTC (rev 4013) +++ labs/jbossrules/trunk/pom.xml 2006-04-30 14:43:45 UTC (rev 4014) @@ -204,6 +204,11 @@ <repositories> <repository> + <id>apache</id> + <url>http://cvs.apache.org/maven-snapshot-repository/</url> + </repository> + + <repository> <id>ibiblio</id> <url>http://www.ibiblio.org/maven2/</url> </repository> @@ -216,7 +221,7 @@ <repository> <id>basedir</id> <url>file://${basedir}/repository</url> - </repository> + </repository> <repository> <id>Maven Snapshots</id> |