Changeset 282

Timestamp:

12/08/11 17:43:55 (13 years ago)

Author:

sherbold

Message:

 

Location:

trunk/JavaCommons

Files:

• . (modified) (1 prop)
• build.xml (modified) (7 diffs)
• lib-test/annotations.jar (added)
• lib-test/asm-3.3.jar (added)
• lib-test/asm-analysis-3.3.jar (added)
• lib-test/asm-commons-3.3.jar (added)
• lib-test/asm-tree-3.3.jar (added)
• lib-test/asm-util-3.3.jar (added)
• lib-test/asm-xml-3.3.jar (added)
• lib-test/bcel.jar (added)
• lib-test/buggy.icns (added)
• lib-test/commons-lang-2.4.jar (added)
• lib-test/dom4j-1.6.1.jar (added)
• lib-test/findbugs-ant.jar (added)
• lib-test/findbugs.jar (added)
• lib-test/jFormatString.jar (added)
• lib-test/jaxen-1.1.1.jar (added)
• lib-test/jcip-annotations.jar (added)
• lib-test/jdepend-2.9.jar (added)
• lib-test/jsr305.jar (added)

trunk/JavaCommons

@@ -16 +16 @@
 
 inst
+
+findbugs

@@ -16 +16 @@
 
 inst
+
+findbugs

trunk/JavaCommons/build.xml

@@ -95 +95 @@
         <property name="JFCMonitor.jarname" value="jfcmonitor.jar" />
         <property name="JFCMonitor.location" value="../JFCMonitor" />
-        <path id="JFCMonitor.classpath" />
+        <path id="JFCMonitor.classpath">
+                <pathelement location="${build.location.jfcmonitor}" />
+        </path>
 
         <!-- Emma Configuration -->
@@ -130 +132 @@
         </path>
         <path id="EventBenchCoreJUnitExecute.classpath">
-                        <pathelement location="${coverage.instrumented.eventbenchcore}" />
-                        <path refid="EventBenchCoreJUnitCompile.classpath" />
-                        <path refid="emma.classpath" />
-                </path>
+                <pathelement location="${coverage.instrumented.eventbenchcore}" />
+                <path refid="EventBenchCoreJUnitCompile.classpath" />
+                <path refid="emma.classpath" />
+        </path>
 
         <!-- JUnit Test JavaHelperLib Properties -->
@@ -151 +153 @@
         </path>
 
-
+        <!-- FindBugs Properties -->
+        <property name="findbugs.results.location" value="findbugs" />
+        <path id="findbugs.classpath">
+                <pathelement location="lib-test/findbugs-ant.jar" />
+        </path>
+        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+                classpathref="findbugs.classpath" />
 
         <!-- Initialization Targets -->
@@ -198 +206 @@
                 <mkdir dir="${coverage.location}" />
         </target>
+        <target name="init.findbugs">
+                <mkdir dir="${findbugs.results.location}" />
+        </target>
 
         <!-- Clean-up Targets -->
@@ -217 +228 @@
                 <delete dir="${coverage.instrumented}" />
         </target>
-        <target depends="clean.build,clean.dist,clean.javadoc,clean.junit"
+        <target name="clean.findbugs">
+                <delete dir="${findbugs.results.location}" />
+        </target>
+        <target depends="clean.build,clean.dist,clean.javadoc,clean.junit,clean.emma,clean.findbugs"
                 name="clean.all" />
 
@@ -380 +394 @@
                         </test>
                         <jvmarg
-                                                        value="-Demma.coverage.out.file=${coverage.location}/eventbenchcore.emma" />
-                                                <jvmarg value="-Demma.coverage.out.merge=true" />
+                                value="-Demma.coverage.out.file=${coverage.location}/eventbenchcore.emma" />
+                        <jvmarg value="-Demma.coverage.out.merge=true" />
                 </junit>
         </target>
@@ -423 +437 @@
                 </emma>
         </target>
+
+        <!-- FindBugs Targets -->
+        <target depends="dist" name="findbugs.javahelperlib">
+                <mkdir dir="${findbugs.results.location}" />
+                <findbugs home="lib-test" output="xml"
+                        outputFile="${findbugs.results.location}/findbugs-javahelperlib.xml">
+                        <auxClasspath refid="JavaHelperLib.classpath" />
+                        <sourcePath path="${JavaHelperLib.location}" />
+                        <class location="${dist.location.main}/${JavaHelperLib.jarname}" />
+                </findbugs>
+        </target>
+        <target depends="dist" name="findbugs.eventbenchcore">
+                <mkdir dir="${findbugs.results.location}" />
+                <findbugs home="lib-test" output="xml"
+                        outputFile="${findbugs.results.location}/findbugs-eventbenchcore.xml">
+                        <auxClasspath refid="EventBenchCore.classpath" />
+                        <sourcePath path="${EventBenchCore.location}" />
+                        <class location="${dist.location.main}/${EventBenchCore.jarname}" />
+                </findbugs>
+        </target>
+        <target depends="dist" name="findbugs.eventbenchconsole">
+                <mkdir dir="${findbugs.results.location}" />
+                <findbugs home="lib-test" output="xml"
+                        outputFile="${findbugs.results.location}/findbugs-eventbenchconsole.xml">
+                        <auxClasspath refid="EventBenchConsole.classpath" />
+                        <sourcePath path="${EventBenchConsole.location}" />
+                        <class location="${dist.location.main}/${EventBenchConsole.jarname}" />
+                </findbugs>
+        </target>
+        <target depends="dist" name="findbugs.jfcmonitor">
+                <mkdir dir="${findbugs.results.location}" />
+                <findbugs home="lib-test" output="xml"
+                        outputFile="${findbugs.results.location}/findbugs-jfcmonitor.xml">
+                        <auxClasspath refid="JFCMonitor.classpath" />
+                        <sourcePath path="${JFCMonitor.location}" />
+                        <class location="${dist.location.jfcmonitor}/${JFCMonitor.jarname}" />
+                </findbugs>
+        </target>
+        <target depends="findbugs.javahelperlib,findbugs.eventbenchcore,findbugs.eventbenchconsole,findbugs.jfcmonitor" name="findbugs" />
 </project>

@@ -16 +16 @@
 
 inst
+
+findbugs