[jboss-svn-commits] JBL Code SVN: r35592 - in labs/jbossrules/trunk: drools-core and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 20 07:52:35 EDT 2010
Author: ge0ffrey
Date: 2010-10-20 07:52:35 -0400 (Wed, 20 Oct 2010)
New Revision: 35592
Modified:
labs/jbossrules/trunk/drools-compiler/pom.xml
labs/jbossrules/trunk/drools-core/pom.xml
Log:
identation
Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml 2010-10-20 11:19:32 UTC (rev 35591)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml 2010-10-20 11:52:35 UTC (rev 35592)
@@ -1,238 +1,238 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>drools</artifactId>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>drools</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.2.0.SNAPSHOT</version>
+ </parent>
+ <artifactId>drools-compiler</artifactId>
+ <packaging>jar</packaging>
+ <name>Drools :: Compiler</name>
+ <dependencies>
+ <!-- Internal dependencies -->
+ <dependency>
<groupId>org.drools</groupId>
- <version>5.2.0.SNAPSHOT</version>
- </parent>
- <artifactId>drools-compiler</artifactId>
- <packaging>jar</packaging>
- <name>Drools :: Compiler</name>
- <dependencies>
- <!-- Internal dependencies -->
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- </dependency>
- <!-- External dependencies -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>gunit</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- </dependency>
- <dependency>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-embedded</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.glazedlists</groupId>
- <artifactId>glazedlists_java15</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>grammars</id>
- <activation>
- <property>
- <name>grammars</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <tasks if="generategrammars">
- <path id="base.classpath">
- <pathelement path="${user.home}/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar" />
- <pathelement path="${user.home}/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar" />
- <pathelement path="${user.home}/.m2/repository/org/antlr/antlr/3.1.1/antlr-3.1.1.jar" />
- </path>
- <property name="antlr_classpath" refid="maven.compile.classpath" />
- <echo message="Generating Antlr Grammars" />
- <java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL.g src/main/resources/org/drools/lang/DescrBuilderTree.g" />
- <classpath refid="base.classpath" />
- </java>
- <move todir="src/main/java/org/drools/lang/">
- <fileset dir="src/main/resources/org/drools/lang">
- <include name="**/*.java" />
- </fileset>
- </move>
- <java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/Tree2TestDRL.g" />
- <classpath refid="base.classpath" />
- </java>
- <move todir="src/test/java/org/drools/lang/">
- <fileset dir="src/main/resources/org/drools/lang">
- <include name="**/*.java" />
- </fileset>
- </move>
- <java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/lang/dsl src/main/resources/org/drools/lang/dsl/DSLMap.g src/main/resources/org/drools/lang/dsl/DSLMapWalker.g" />
- <classpath refid="base.classpath" />
- </java>
- <move todir="src/main/java/org/drools/lang/dsl/">
- <fileset dir="src/main/resources/org/drools/lang/dsl">
- <include name="**/*.java" />
- </fileset>
- </move>
- <java classname="org.antlr.Tool" fork="true">
- <arg line="-lib src/main/resources/org/drools/semantics/java/parser src/main/resources/org/drools/semantics/java/parser/Java.g" />
- <classpath refid="base.classpath" />
- </java>
- <move todir="src/main/java/org/drools/rule/builder/dialect/java/parser">
- <fileset dir="src/main/resources/org/drools/semantics/java/parser">
- <include name="**/*.java" />
- </fileset>
- </move>
- <delete>
- <fileset dir="src/main/resources/org/drools/lang">
- <include name="**/*.tokens" />
- <include name="DRL__.g" />
- <include name="dsl/DSLMap__.g" />
- </fileset>
- <fileset dir="src/main/resources/org/drools/semantics/java/parser">
- <include name="**/*.tokens" />
- <include name="Java__.g" />
- </fileset>
- </delete>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <artifactId>drools-core</artifactId>
+ </dependency>
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>gunit</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>janino</groupId>
+ <artifactId>janino</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-embedded</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.glazedlists</groupId>
+ <artifactId>glazedlists_java15</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>grammars</id>
+ <activation>
+ <property>
+ <name>grammars</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
- <id>manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks if="generategrammars">
+ <path id="base.classpath">
+ <pathelement path="${user.home}/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <pathelement path="${user.home}/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
+ <pathelement path="${user.home}/.m2/repository/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
+ </path>
+ <property name="antlr_classpath" refid="maven.compile.classpath"/>
+ <echo message="Generating Antlr Grammars"/>
+ <java classname="org.antlr.Tool" fork="true">
+ <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/DRL.g src/main/resources/org/drools/lang/DescrBuilderTree.g"/>
+ <classpath refid="base.classpath"/>
+ </java>
+ <move todir="src/main/java/org/drools/lang/">
+ <fileset dir="src/main/resources/org/drools/lang">
+ <include name="**/*.java"/>
+ </fileset>
+ </move>
+ <java classname="org.antlr.Tool" fork="true">
+ <arg line="-lib src/main/resources/org/drools/lang src/main/resources/org/drools/lang/Tree2TestDRL.g"/>
+ <classpath refid="base.classpath"/>
+ </java>
+ <move todir="src/test/java/org/drools/lang/">
+ <fileset dir="src/main/resources/org/drools/lang">
+ <include name="**/*.java"/>
+ </fileset>
+ </move>
+ <java classname="org.antlr.Tool" fork="true">
+ <arg line="-lib src/main/resources/org/drools/lang/dsl src/main/resources/org/drools/lang/dsl/DSLMap.g src/main/resources/org/drools/lang/dsl/DSLMapWalker.g"/>
+ <classpath refid="base.classpath"/>
+ </java>
+ <move todir="src/main/java/org/drools/lang/dsl/">
+ <fileset dir="src/main/resources/org/drools/lang/dsl">
+ <include name="**/*.java"/>
+ </fileset>
+ </move>
+ <java classname="org.antlr.Tool" fork="true">
+ <arg line="-lib src/main/resources/org/drools/semantics/java/parser src/main/resources/org/drools/semantics/java/parser/Java.g"/>
+ <classpath refid="base.classpath"/>
+ </java>
+ <move todir="src/main/java/org/drools/rule/builder/dialect/java/parser">
+ <fileset dir="src/main/resources/org/drools/semantics/java/parser">
+ <include name="**/*.java"/>
+ </fileset>
+ </move>
+ <delete>
+ <fileset dir="src/main/resources/org/drools/lang">
+ <include name="**/*.tokens"/>
+ <include name="DRL__.g"/>
+ <include name="dsl/DSLMap__.g"/>
+ </fileset>
+ <fileset dir="src/main/resources/org/drools/semantics/java/parser">
+ <include name="**/*.tokens"/>
+ <include name="Java__.g"/>
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <_removeheaders>Ignore-Package</_removeheaders>
- <Bundle-SymbolicName>org.drools.compiler;singleton:=true</Bundle-SymbolicName>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
- <Import-Package>!org.drools.*,
- <!-- java compilers are optional: only need one at most -->
- org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
- *</Import-Package>
- <Export-Package>org.drools.lang.descr,!org.drools.commons.*, !org.drools.lang.*, org.drools.builder.impl,
- <!-- add this one manually as BND seems to miss it out -->
- org.drools.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- <Bundle-Activator>org.drools.osgi.compiler.Activator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <_removeheaders>Ignore-Package</_removeheaders>
+ <Bundle-SymbolicName>org.drools.compiler;singleton:=true</Bundle-SymbolicName>
+ <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Import-Package>!org.drools.*,
+ <!-- java compilers are optional: only need one at most -->
+ org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
+ *</Import-Package>
+ <Export-Package>org.drools.lang.descr,!org.drools.commons.*, !org.drools.lang.*, org.drools.builder.impl,
+ <!-- add this one manually as BND seems to miss it out -->
+ org.drools.*</Export-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <Bundle-Activator>org.drools.osgi.compiler.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2010-10-20 11:19:32 UTC (rev 35591)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2010-10-20 11:52:35 UTC (rev 35592)
@@ -49,31 +49,31 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
@@ -97,31 +97,31 @@
<tasks if="generategrammars">
<path id="base.classpath">
<pathelement
- path="${user.home}/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar" />
+ path="${user.home}/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
<pathelement
- path="${user.home}/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar" />
+ path="${user.home}/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<pathelement
- path="${user.home}/.m2/repository/org/antlr/antlr/3.1.1/antlr-3.1.1.jar" />
+ path="${user.home}/.m2/repository/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
</path>
- <property name="antlr_classpath" refid="maven.compile.classpath" />
- <echo message="Generating Antlr Grammars" />
+ <property name="antlr_classpath" refid="maven.compile.classpath"/>
+ <echo message="Generating Antlr Grammars"/>
<java classname="org.antlr.Tool" fork="true">
<arg
- line="-lib src/test/resources/org/drools/reteoo/test/parser src/test/resources/org/drools/reteoo/test/parser/NodeTestDSL.g src/test/resources/org/drools/reteoo/test/parser/NodeTestDSLTree.g" />
- <classpath refid="base.classpath" />
+ line="-lib src/test/resources/org/drools/reteoo/test/parser src/test/resources/org/drools/reteoo/test/parser/NodeTestDSL.g src/test/resources/org/drools/reteoo/test/parser/NodeTestDSLTree.g"/>
+ <classpath refid="base.classpath"/>
</java>
<move todir="src/test/java/org/drools/reteoo/test/parser">
<fileset dir="src/test/resources/org/drools/reteoo/test/parser">
- <include name="**/*.java" />
- <exclude name="**/__*" />
+ <include name="**/*.java"/>
+ <exclude name="**/__*"/>
</fileset>
</move>
<delete>
<fileset dir="src/test/resources/org/drools/reteoo/test/parser">
- <include name="**/*.tokens" />
- <include name="**/classes" />
- <include name="**/__*" />
- <include name="NodeTestDSL__.g" />
+ <include name="**/*.tokens"/>
+ <include name="**/classes"/>
+ <include name="**/__*"/>
+ <include name="NodeTestDSL__.g"/>
</fileset>
</delete>
</tasks>
@@ -165,8 +165,8 @@
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
<Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
- <Import-Package>!org.drools.*, *,org.osgi.util.tracker</Import-Package>
- <Export-Package>!org.drools.visualize,org.drools.reteoo.*, org.drools.*</Export-Package>
+ <Import-Package>!org.drools.*, *,org.osgi.util.tracker</Import-Package>
+ <Export-Package>!org.drools.visualize,org.drools.reteoo.*, org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
</instructions>
More information about the jboss-svn-commits
mailing list