[jboss-cvs] JBossAS SVN: r111221 - in projects/jboss-jca/trunk: api and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 20 13:44:13 EDT 2011


Author: jesper.pedersen
Date: 2011-04-20 13:44:12 -0400 (Wed, 20 Apr 2011)
New Revision: 111221

Modified:
   projects/jboss-jca/trunk/adapters/build.xml
   projects/jboss-jca/trunk/api/build.xml
   projects/jboss-jca/trunk/codegenerator/build.xml
   projects/jboss-jca/trunk/common/build.xml
   projects/jboss-jca/trunk/core/build.xml
   projects/jboss-jca/trunk/deployers/build.xml
   projects/jboss-jca/trunk/doc/samples/helloworld/build.xml
   projects/jboss-jca/trunk/embedded/build.xml
   projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/PostClassLoaderEventListener.java
   projects/jboss-jca/trunk/rhq/build.xml
   projects/jboss-jca/trunk/sjc/build.xml
   projects/jboss-jca/trunk/validator/build.xml
   projects/jboss-jca/trunk/validator/src/main/resources/validator.bat
   projects/jboss-jca/trunk/validator/src/main/resources/validator.sh
   projects/jboss-jca/trunk/web/build.xml
Log:
Build cleanups

Modified: projects/jboss-jca/trunk/adapters/build.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/adapters/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -41,7 +41,8 @@
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
            optimize="${javac.optimize}"
-           excludes="**/jdk6/**,**/jdk7/**">
+           excludes="**/jdk6/**,**/jdk7/**"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -53,7 +54,8 @@
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
            optimize="${javac.optimize}"
-           includes="**/jdk6/**">
+           includes="**/jdk6/**"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -65,7 +67,8 @@
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
            optimize="${javac.optimize}"
-           includes="**/jdk7/**">
+           includes="**/jdk7/**"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -270,7 +273,8 @@
            classpathref="adapters.test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/api/build.xml
===================================================================
--- projects/jboss-jca/trunk/api/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/api/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -37,7 +37,10 @@
     <javac srcdir="src"
            destdir="${build.api.dir}"
            classpathref="sjc.lib.path.id"
-           debug="${javac.debug}">
+           debug="${javac.debug}"
+           deprecation="${javac.deprecation}"
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <!-- <compilerarg value="-Xlint"/> -->
     </javac> 
 

Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/codegenerator/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -40,7 +40,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -215,7 +216,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/common/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -37,7 +37,10 @@
     <javac srcdir="src/main"
            destdir="${build.common.dir}"
            classpathref="sjc.lib.path.id"
-           debug="${javac.debug}">
+           debug="${javac.debug}"
+           deprecation="${javac.deprecation}"
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac>
     
@@ -249,7 +252,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint" />
     </javac>
     

Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/core/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -40,7 +40,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 
@@ -56,7 +57,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 
@@ -250,7 +252,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/deployers/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -40,7 +40,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -283,7 +284,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -76,7 +76,10 @@
 
     <javac srcdir="${basedir}/src/main/java"
            destdir="${build.dir}"
-           classpathref="lib.path.id">
+           classpathref="lib.path.id"
+           debug="${javac.debug}"
+           deprecation="${javac.deprecation}"
+           optimize="${javac.optimize}">
     </javac> 
   </target>
   

Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/embedded/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -45,7 +45,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -134,7 +135,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/PostClassLoaderEventListener.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/PostClassLoaderEventListener.java	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/PostClassLoaderEventListener.java	2011-04-20 17:44:12 UTC (rev 111221)
@@ -46,6 +46,7 @@
     * @param kernel The kernel
     * @param event The event
     */
+   @SuppressWarnings("unchecked")
    public void event(Kernel kernel, Event event)
    {
       if (event == Event.POST_CLASSLOADER)

Modified: projects/jboss-jca/trunk/rhq/build.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/rhq/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -40,7 +40,8 @@
            classpathref="rhq.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -199,7 +200,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/sjc/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -45,7 +45,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>

Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/validator/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -40,7 +40,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>
@@ -85,7 +86,7 @@
         <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
         <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
         <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
-        <attribute name="Class-Path" value="jbossxb.jar jboss-logging-spi.jar jboss-common-core.jar jboss-metadata-rar.jar jboss-metadata-common.jar jboss-reflect.jar jboss-mdr.jar ${name}-spec-api.jar papaki-core.jar javassist.jar ${name}-common-impl.jar"/>
+        <attribute name="Class-Path" value="jboss-logging.jar jboss-common-core.jar ${name}-spec-api.jar papaki-core.jar javassist.jar ${name}-common-api.jar ${name}-common-impl.jar"/>
       </manifest>
     </jar>
 
@@ -271,7 +272,8 @@
            classpathref="test.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
 

Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator.bat
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.bat	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.bat	2011-04-20 17:44:12 UTC (rev 111221)
@@ -1 +1 @@
-java -classpath ..\..\lib\ironjacamar-validator-cli.jar;..\..\lib\ironjacamar-common-spi.jar;..\..\lib\jboss-logging-spi.jar;..\..\lib\jboss-logging.jar;..\..\lib\jboss-common-core.jar;..\..\lib\ironjacamar-spec-api.jar;..\..\lib\papaki-core.jar;..\..\lib\javassist.jar;..\..\lib\ironjacamar-common-impl.jar;..\..\lib\ironjacamar-common-impl-papaki.jar;..\..\lib\ironjacamar-common-api.jar;..\..\lib\ironjacamar-validator.jar org.jboss.jca.validator.cli.Main %*
+java -classpath ..\..\lib\ironjacamar-validator-cli.jar;..\..\lib\ironjacamar-common-spi.jar;..\..\lib\jboss-logging.jar;..\..\lib\jboss-common-core.jar;..\..\lib\ironjacamar-spec-api.jar;..\..\lib\papaki-core.jar;..\..\lib\javassist.jar;..\..\lib\ironjacamar-common-impl.jar;..\..\lib\ironjacamar-common-impl-papaki.jar;..\..\lib\ironjacamar-common-api.jar;..\..\lib\ironjacamar-validator.jar org.jboss.jca.validator.cli.Main %*

Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator.sh
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.sh	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.sh	2011-04-20 17:44:12 UTC (rev 111221)
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -classpath ../../lib/ironjacamar-validator-cli.jar:../../lib/jbossxb.jar:../../lib/jboss-logging.jar:../../lib/jboss-common-core.jar:../../lib/ironjacamar-spec-api.jar:../../lib/papaki-core.jar:../../lib/javassist.jar:../../lib/ironjacamar-common-impl.jar:../../lib/ironjacamar-common-impl-papaki.jar:../../lib/ironjacamar-common-api.jar:../../lib/ironjacamar-common-spi.jar:../../lib/ironjacamar-validator.jar org.jboss.jca.validator.cli.Main $*
+java -classpath ../../lib/ironjacamar-validator-cli.jar:../../lib/jboss-logging.jar:../../lib/jboss-common-core.jar:../../lib/ironjacamar-spec-api.jar:../../lib/papaki-core.jar:../../lib/javassist.jar:../../lib/ironjacamar-common-impl.jar:../../lib/ironjacamar-common-impl-papaki.jar:../../lib/ironjacamar-common-api.jar:../../lib/ironjacamar-common-spi.jar:../../lib/ironjacamar-validator.jar org.jboss.jca.validator.cli.Main $*

Modified: projects/jboss-jca/trunk/web/build.xml
===================================================================
--- projects/jboss-jca/trunk/web/build.xml	2011-04-20 12:55:21 UTC (rev 111220)
+++ projects/jboss-jca/trunk/web/build.xml	2011-04-20 17:44:12 UTC (rev 111221)
@@ -45,7 +45,8 @@
            classpathref="sjc.lib.path.id"
            debug="${javac.debug}"
            deprecation="${javac.deprecation}"
-           optimize="${javac.optimize}">
+           optimize="${javac.optimize}"
+           includeAntRuntime="false">
       <compilerarg value="-Xlint"/>
     </javac> 
   </target>



More information about the jboss-cvs-commits mailing list