[jboss-svn-commits] JBL Code SVN: r37248 - in labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules: lib/ext and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 7 01:18:08 EDT 2011
Author: tcunning
Date: 2011-07-07 01:18:08 -0400 (Thu, 07 Jul 2011)
New Revision: 37248
Added:
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-compiler-5.2.1.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-core-5.2.1.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-decisiontables-5.2.1.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-jsr94-5.2.1.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-templates-5.2.1.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/knowledge-api-5.2.1.Final.jar
Removed:
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/aop/
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-compiler-5.2.0.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-core-5.2.0.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-decisiontables-5.2.0.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-jsr94-5.2.0.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-templates-5.2.0.Final.jar
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/knowledge-api-5.2.0.Final.jar
Modified:
labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/build.xml
Log:
Remove AOP fixes on top of drools 5.2.0 Final and check in current 5.2.x JARs for now.
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/build.xml 2011-07-06 19:59:25 UTC (rev 37247)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/build.xml 2011-07-07 05:18:08 UTC (rev 37248)
@@ -3,46 +3,8 @@
<property file="build.properties"/>
<!-- Import the base Ant build script... -->
<import file="${services.base.build}"/>
-
- <property name="drools.core.jar" value="drools-core-5.2.0.Final.jar"/>
- <property name="drools.core.aop.jar" value="drools-core-5.2.0.Final-aop.jar"/>
- <property name="aop.dir" location="aop"/>
- <property name="aop.src.dir" location="${aop.dir}/java"/>
- <property name="aop.resources.dir" location="${aop.dir}/resources"/>
- <property name="aop.jar.version" value="5.2.0.Final"/>
- <property name="aop.jar.name" value="drools-core-${aop.jar.version}.aop"/>
- <property name="aop.jar" value="build/${aop.jar.name}"/>
- <property name="aop.classes.dir" location="build/aop-classes"/>
- <property name="aopc.drools.classes.dir" location="build/aopc-drools-classes"/>
-
- <property file="${esb.root.dir}/install/deployment.properties"/>
-
- <path id="jboss-esb-dependencies">
- <fileset dir="../../build/jbossesb/lib" includes="jbossesb-rosetta.jar" />
- </path>
-
- <path id="build.classpath">
- <path location="${basedir}/src/test/resources"/>
- <path location="${aopc.drools.classes.dir}"/>
- <fileset dir="../../build/lib" includes="jboss-aop-jdk50-1.5.6.GA.jar, jboss-system-4.2.2.GA.jar" />
- <fileset dir="lib/ext" includes="*.jar"/>
- <fileset dir="../../lib/ext" includes="*.jar" />
- <fileset dir="../../build/lib" includes="*.jar" />
- <fileset dir="../../../testlib" includes="*.jar"/>
- <!--
- <fileset dir="${org.jboss.esb.server.home}/client">
- <include name="jboss-mdr.jar"/>
- <include name="javassist*.jar"/>
- <include name="trove*.jar"/>
- <include name="concurrent*.jar"/> <include name="jboss-aop*.jar"/>
- <include name="jboss-common*.jar"/>
- <include name="jboss-logging-*.jar"/>
- </fileset>
- -->
- <path refid="jboss-esb-dependencies" />
- </path>
- <target name="test" depends="esb">
+ <target name="test">
<copy todir="${basedir}/build/tests/classes" overwrite="true">
<fileset dir="${basedir}/src/test/resources">
<include name="*.xls"/>
@@ -51,57 +13,7 @@
<include name="*.pkg"/>
</fileset>
</copy>
- <mkdir dir="build/tests/classes"/>
- <mkdir dir="build/tests/report"/>
- <javac srcdir="src/test/java" destdir="build/tests/classes" debug="on" >
- <classpath>
- <path refid="exec.classpath" />
- <path refid="test.classpath" />
- </classpath>
- </javac>
- <copy todir="build/tests/classes" >
- <fileset dir="src/test/java" excludes="**/*.java" />
- </copy>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="build/tests/report">
- <fileset dir="src/test/java">
- <include name="**/*UnitTest.java"/>
- </fileset>
- </batchtest>
- <classpath>
- <pathelement location="build/jbrules.esb/${drools.core.aop.jar}"/>
- <fileset dir="../../build/lib" includes="jboss-aop-jdk50-1.5.6.GA.jar"/>
- <pathelement location="${aop.jar}"/>
- <fileset dir="${org.jboss.esb.server.home}/client">
- <include name="jboss-mdr.jar"/>
- <include name="javassist*.jar"/>
- <include name="trove*.jar"/>
- <include name="concurrent*.jar"/>
- <include name="jboss-aop*.jar"/>
- <include name="jboss-common*.jar"/>
- <include name="jboss-logging-*.jar"/>
- </fileset>
-
- <pathelement location="${esb.root.dir}/ftp/lib/slf4j-log4j12-1.3.0.jar"/>
- <pathelement location="${esb.root.dir}/ftp/lib/slf4j-api-1.3.0.jar"/>
- <pathelement location="${esb.root.dir}/build/jbossesb/lib/test-util.jar"/>
- <!-- log4j location -->
- <pathelement location="test/resources"/>
- <!-- using instrumented code for code coverage -->
- <pathelement location="${coverage.dir}/instr"/>
- <pathelement location="build/tests/classes/"/>
- <path refid="exec.classpath" />
- <path refid="test.classpath" />
- </classpath>
- <!-- emma jvm args -->
- <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
- <sysproperty key="log4j.configuration" value="log4j.xml"/>
- <sysproperty key="jboss.esb.invm.scope.default" value="NONE"/>
- <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/>
- </junit>
-
+ <antcall target="base.test"/>
</target>
<target name="generatePackageFile" depends="compile"
@@ -113,47 +25,5 @@
<classpath refid="classpath" />
</java>
</target>
-
- <target name="aop-compile">
- <mkdir dir="${aop.classes.dir}"/>
- <javac srcdir="${aop.src.dir}" destdir="${aop.classes.dir}"
- debug="true" source="1.5" classpathref="build.classpath"/>
- </target>
-
- <target name="aop-jar" depends="aop-compile">
- <jar destfile="${aop.jar}">
- <fileset dir="${aop.classes.dir}"/>
- <fileset dir="${aop.resources.dir}"/>
- </jar>
- </target>
-
- <target name="aopc-jar">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="build.classpath"/>
-
- <delete dir="${aopc.drools.classes.dir}" quiet="true"/>
- <mkdir dir="${aopc.drools.classes.dir}"/>
-
- <unzip dest="${aopc.drools.classes.dir}" src="lib/ext/${drools.core.jar}"/>
-
- <aopc compilerclasspathref="build.classpath" verbose="true">
- <classpath path="${aopc.drools.classes.dir}"/>
- <src path="${aopc.drools.classes.dir}"/>
- <include name="org/drools/base/ClassFieldAccessorFactory.class"/>
- <include name="org/drools/reteoo/ReteooFactHandleFactory.class"/>
- <aoppath path="${aop.resources.dir}/META-INF/jboss-aop.xml"/>
- <aopclasspath path="${aop.classes.dir}"/>
- </aopc>
-
- <zip destfile="build/${drools.core.aop.jar}" basedir="${aopc.drools.classes.dir}"/>
- <delete file="build/jbrules.esb/${drools.core.jar}"/>
- <copy file="build/${drools.core.aop.jar}" todir="build/jbrules.esb"/>
- </target>
-
- <target name="service-compile" depends="aop-jar,aopc-jar"/>
-
- <target name="service-esb">
- <delete file="build/jbrules.esb/${drools.core.jar}"/>
- <copy file="${aop.jar}" todir="build/jbrules.esb"/>
- </target>
-
+
</project>
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-compiler-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-compiler-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-compiler-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-core-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-core-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-core-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-decisiontables-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-decisiontables-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-decisiontables-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-jsr94-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-jsr94-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-jsr94-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-templates-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-templates-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/drools-templates-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/knowledge-api-5.2.0.Final.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/knowledge-api-5.2.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbrules/lib/ext/knowledge-api-5.2.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list