October 2009 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r8095 - in trunk: tools and 5 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-13 12:16:57 -0400 (Tue, 13 Oct 2009) New Revision: 8095 Added: trunk/build.bat trunk/build.sh trunk/tools/ant/ trunk/tools/ant/INSTALL trunk/tools/ant/KEYS trunk/tools/ant/LICENSE trunk/tools/ant/NOTICE trunk/tools/ant/README trunk/tools/ant/WHATSNEW trunk/tools/ant/bin/ trunk/tools/ant/bin/ant trunk/tools/ant/bin/ant.bat trunk/tools/ant/bin/ant.cmd trunk/tools/ant/bin/antRun trunk/tools/ant/bin/antRun.bat trunk/tools/ant/bin/antRun.pl trunk/tools/ant/bin/antenv.cmd trunk/tools/ant/bin/complete-ant-cmd.pl trunk/tools/ant/bin/envset.cmd trunk/tools/ant/bin/lcp.bat trunk/tools/ant/bin/runant.pl trunk/tools/ant/bin/runant.py trunk/tools/ant/bin/runrc.cmd trunk/tools/ant/etc/ trunk/tools/ant/etc/ant-bootstrap.jar trunk/tools/ant/etc/changelog.xsl trunk/tools/ant/etc/checkstyle/ trunk/tools/ant/etc/checkstyle/checkstyle-frames.xsl trunk/tools/ant/etc/checkstyle/checkstyle-text.xsl trunk/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl trunk/tools/ant/etc/coverage-frames.xsl trunk/tools/ant/etc/jdepend-frames.xsl trunk/tools/ant/etc/jdepend.xsl trunk/tools/ant/etc/junit-frames-xalan1.xsl trunk/tools/ant/etc/junit-frames.xsl trunk/tools/ant/etc/junit-noframes.xsl trunk/tools/ant/etc/log.xsl trunk/tools/ant/etc/maudit-frames.xsl trunk/tools/ant/etc/mmetrics-frames.xsl trunk/tools/ant/etc/tagdiff.xsl trunk/tools/ant/fetch.xml trunk/tools/ant/get-m2.xml trunk/tools/ant/lib/ trunk/tools/ant/lib/ant-antlr.jar trunk/tools/ant/lib/ant-apache-bcel.jar trunk/tools/ant/lib/ant-apache-bsf.jar trunk/tools/ant/lib/ant-apache-log4j.jar trunk/tools/ant/lib/ant-apache-oro.jar trunk/tools/ant/lib/ant-apache-regexp.jar trunk/tools/ant/lib/ant-apache-resolver.jar trunk/tools/ant/lib/ant-commons-logging.jar trunk/tools/ant/lib/ant-commons-net.jar trunk/tools/ant/lib/ant-jai.jar trunk/tools/ant/lib/ant-javamail.jar trunk/tools/ant/lib/ant-jdepend.jar trunk/tools/ant/lib/ant-jmf.jar trunk/tools/ant/lib/ant-jsch.jar trunk/tools/ant/lib/ant-junit.jar trunk/tools/ant/lib/ant-launcher.jar trunk/tools/ant/lib/ant-netrexx.jar trunk/tools/ant/lib/ant-nodeps.jar trunk/tools/ant/lib/ant-starteam.jar trunk/tools/ant/lib/ant-stylebook.jar trunk/tools/ant/lib/ant-swing.jar trunk/tools/ant/lib/ant-testutil.jar trunk/tools/ant/lib/ant-trax.jar trunk/tools/ant/lib/ant-weblogic.jar trunk/tools/ant/lib/ant.jar trunk/tools/ant/lib/xercesImpl.jar trunk/tools/ant/lib/xml-apis.jar Modified: trunk/build.xml Log: Integration of https://jira.jboss.org/jira/browse/HORNETQ-67 part 1 Added: trunk/build.bat =================================================================== --- trunk/build.bat (rev 0) +++ trunk/build.bat 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,54 @@ +@echo off + +rem Copyright 2009 Red Hat, Inc. +rem Red Hat licenses this file to you under the Apache License, version +rem 2.0 (the "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem http://www.apache.org/licenses/LICENSE-2.0 +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +rem implied. See the License for the specific language governing +rem permissions and limitations under the License. + +rem ------------------------------------------------------------------------- +rem HornetQ Build Script for Windows +rem ------------------------------------------------------------------------- + +rem $Id: $ + +rem This build script will ensure a correct ant version is used. +rem Users can also pass in options on the command line. + +rem First check for the existence of JAVA_HOME. It doesn't have to be set, +rem but it may be an indication that javac is not available on the command line. + +if "x%JAVA_HOME%" == "x" ( + echo WARNING: JAVA_HOME is not set. Build may fail. + echo Set JAVA_HOME to the directory of your local JDK to avoid this message. +) +else ( + if exist "%JAVA_HOME%\bin\javac.exe" ( + echo Build script found javac. +) else ( + echo WARNING: javac was not found. Make sure it is available in the path. +)) + +rem Save off the original ANT_HOME. We don't want to destroy environments. +set "ORIG_ANT_HOME=%ANT_HOME%" + +rem Set the new one +set "ANT_HOME=tools\ant" + +rem build HornetQ + +echo "Using the following ant version from %ANT_HOME%:" + +call tools\ant\bin\ant.bat -version + +call tools\ant\bin\ant.bat %* -Dhornetq.run_script=true + +rem Restore the original ANT_HOME values +set "ANT_HOME=%ORIG_ANT_HOME%" + +echo Done Added: trunk/build.sh =================================================================== --- trunk/build.sh (rev 0) +++ trunk/build.sh 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,63 @@ +#!/bin/sh + +# Copyright 2009 Red Hat, Inc. +# Red Hat licenses this file to you under the Apache License, version +# 2.0 (the "License"); you may not use htis file except in compliance +# with the License. You may obtain a copy of the License at +# http://www.apache.org/license/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. + +# ------------------------------------------------ +# HornetQ Build Script for Linux +# ------------------------------------------------ + +# $Id: $ + +# This build script will ensure the correct ant version is used. +# Users can also pass in options on the command line. + +warn() { + echo "${PROGNAME}: $*" +} + +die() { + warn $* + exit 1 +} + +# Save off the original ANT_HOME value +export ORIG_ANT_HOME=$ANT_HOME + +# Set the temporary ANT_HOME +export ANT_HOME=tools/ant + +# Check for JAVA_HOME. If it is not there, warn the user + +if [ -n "$JAVA_HOME" ]; then + + if [ -f "$JAVA_HOME/bin/javac" ]; then + echo "Found javac" + else + die "Could not find javac." + fi +else + warn "JAVA_HOME is not set. Build may fail." + warn "Set JAVA_HOME to the directory of your local JDK to avoid this message." +fi + +# Call ant +chmod +x $ANT_HOME/bin/ant + +echo "Using the following ant version from ${ANT_HOME}:" + +$ANT_HOME/bin/ant -version + +$ANT_HOME/bin/ant "$@" -Dhornetq.run_script=true + + +# Restore the original path +export ANT_HOME=$ORIG_ANT_HOME Property changes on: trunk/build.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-10-13 15:39:49 UTC (rev 8094) +++ trunk/build.xml 2009-10-13 16:16:57 UTC (rev 8095) @@ -22,8 +22,18 @@  -<project default="unit-tests" name="HornetQ"> +<project name="HornetQ" default="jar"> + <property name="hornetq.run_script" value="false" /> + + <fail message="Please build by using the build.sh script (or build.bat on Windows)"> + <condition> + <not> + <equals arg1="${hornetq.run_script}" arg2="true"/> + </not> + </condition> + </fail> +  -debug, -e --> -emacs, + -h --> -help, -p --> -projecthelp, -s --> -find). + +* new selector <modified>. "cache" was renamed to "modified". + Bugzilla Report 20474. + +* <stcheckout> and <stlist> have a new asofdate attribute that can be + used to checkout/list files based on a date instead of a label. + Bugzilla Report 20578. + +* New filter <concatfilter>. Adds the content of file at the beginning + or end of a file. Discussion started at + http://marc.theaimsgroup.com/?l=ant-user&m=106366791228585&w=2 + +* New task <import> + +* New task <macrodef> + +* New task <presetdef> + +* Ant libraries that can make use of namespaces to avoid name + clashes of custom tasks + +* <java> and <junit> now support <assertions>, which let you enable + and disable Java1.4 assertions on a package or class basis. These + only work when fork=true, currently. + +* .NET tasks expanded with VB support <vbc> and J#, via <jsharp>, + <importtypelib> and <ilasm>. <csc> supports nested <src> types, + <defines> for (potentially conditional) definitions, <reference> + filesets for references. The executable attribute lets you switch to + mono or other implementations -<csc> has been tested with Mono on + Linux and OSX. + + +Changes from Ant 1.5.3 to Ant 1.5.4 +=================================== + +Changes that could break older environments: +-------------------------------------------- + +* If the Visual Age tasks used to work for you, they may stop doing so + now - and we'd like to know about it. The current set of tasks is + supposed to work with any version of VAJ starting with 3.0. + +Fixed bugs: +----------- + +* The Visual Age for Java tasks didn't work (at least for versions 3.0 + and higher). Bugzilla Report 10016. + +* URL-encoding in <vaj*port> didn't work properly. + +* VAJRemoteUtil called getAbsolutePath instead of getPath + causing problems when using a Windows VAJ server from a UNIX server. + Bugzilla Report 20457. + +* VAJImport task failed with NullPointerException when using DirectoryScanner. + Bugzilla Report 22080. + +Other changes: +-------------- + +* Shipped XML parser is now Xerces 2.5.0 + +* <javah> will invoke oldjavah on JDK 1.4.2. Bugzilla Report 18667. + +* The VAJ tasks now support a haltonfailure attribute to conditionally + keep building even if they fail. + +* It is now possible to use the latest (versioned or unversioned) edition + in <vajload> by using special wildcard characters. Also fixes + Bugzilla Report 2236. + +Changes from Ant 1.5.2 to Ant 1.5.3 +=================================== + +Changes that could break older environments: +-------------------------------------------- + +* The <zip> task and friends have again changed a method signature + (sorry, was necessary to fix bug 17780). The return type of + getResourcesToAdd has changed. + +Fixed bugs: +----------- + +* <zipfileset>'s filemode would get ignored and the dirmode was used + for the included files as well. As a side effect, WinZIP was unable + to extract or display the files, so they seemed to be missing from + the archive. Bugzilla Report 17648. + +* <ftp> could use the wrong path separator when trying to change the + remote working directory. Bugzilla Report 17735. + +* <jar update="true"> would loose all original files if you didn't + specify any nested <(zip)fileset>s and the manifest had changed. + Bugzilla Report 17780. + +* If you used a value starting with \ on Windows for the appxml + attribute of <ear> or the webxml attribute of <war>, it would be + ignored. Bugzilla Report 17871. + +* Ant will no longer implicitly add Sun's rt.jar in <javac> when you + use jvc and don't specify a bootclasspath. Bugzilla Report 18055. + +* The prefix attribute of <zipfileset> would not generate directory + entries for the prefix itself. Bugzilla Report 18403. + +* starteam checkout can now handle deleted labels. Bugzilla Report 17646. + +* The Unix wrapper script failed if you invoked it as a relative + symlink and ANT_HOME has not been set. Bugzilla Report 17721. + +Other Changes: +-------------- +* Added ability to specify manifest encoding for the <jar> and + <manifest> tasks + +Changes from Ant 1.5.1 to Ant 1.5.2 +============================================= + +Changes that could break older environments: +-------------------------------------------- +* ANT_OPTS environment variable is now applied at the start of the + Java command line, allowing position specific parameters of some + JVMs, such as -classic to be specified. + +* ZipScanner#getIncludedFiles will now return the names of the ZipEntries + that have been matched instead of the name of the archive. + +* The <zip> task and friends have been heavily modified, almost every + method signature of the Zip class has changed. If you have subclassed + Zip (or one of its subclasses), your class will most likely not + compile against the current code base. If it still compiles, it will + probably not work as in Ant 1.5.1. + +Fixed bugs: +----------- +* <translate> was not ignoring comment lines. + +* <manifest> wouldn't update an existing manifest if only an attribute + of an existing section changed. + +* ant.bat now supports the ANT_ARGS and JAVACMD environment variables + again (like Ant 1.5 did). + +* The "plain" <junit> <formatter> could throw a NullPointerException + if an error occurred in setUp. + +* <junit> will now produce output when a test times out as well. + +* <replace> would count some internal character replacements when + reporting the number of replaced tokens. + +* <concat> would cause an exception if a <filelist> pointed to files + that do not exist. + +* <javadoc> will now pass -source to custom doclets as well. + +* <cvstagdiff> would throw a NullPointException if there had been no + differences. + +* <cvschangelog> could miss today's changes. + +* <concat> could append newline characters between concatenated files. + +* <xmlvalidate> ignored the specified encoding of the files to + validate. + +* the errorsbeginat attribute of the <http> condition didn't work. + +* Ant will try to force loading of certain packages like com.sun.* + from the system classloader. The packages are determined by the + version of the JVM running Ant. + +* Ant didn't find the runtime libraries on IBM's JDK 1.4 for Linux. + +* random component of temporary files is now always a positive integer. + +* Ant could incorrectly try to use the 1.4 regexp implementation even + if it isn't available if you run the JVM with -Xverify:none. + +* Ant would die with an exception if you used nested <reference> + elements in Ant and the refid attribute didn't point to an existing + project reference. + +* The <get> task can now be compiled (and Ant thus bootstrapped) using + Kaffee. + +* build.sysclasspath will now be honored by more tasks. + +* The signjar keystore attribute has been reverted to a String allowing + it to once again accept URLs. This should not affect current File based usage + unless you are extending the Signjar task. + +* <jar update="true"> would remove the original manifest. + +* fix up folder creation in PVCS task + +* <tar>'s up-to-date check didn't work for nested <(tar)fileset>s. + +* Corrected a problem in XMLLogger where it would not associated + messages with a taskdef'd task + +* <uptodate> now works when using attributes (i.e. not filesets) and pointing + to the same file + +* Java task (and output system) now stores output which doos not end + with a line feed. + +* splash screen wouldn't disappear when build was finished. + +* <exec> now supports OS/2. + +* <zip> and friends would only update/recreate existing archives if + the files to add/update have been newer than the archive. + +* <javadoc>'s <link> element could fail for offline="true" on some JDKs. + +Other changes: +-------------- + +* MailLogger now sets the Date header correctly. + +* Shipped XML parser is now Xerces 2.3.0 + +* signjar now accepts a maxmemory attribute to allow the memory allocated to the + jarsigner tool to be specified. The jarsigner from the JDK's JAVA_HOME bin + dir is now used rather than the first jarsigner on the path. + +* **/.DS_Store has been added to the list of default pattern excludes. + +* The Created-By header in the default manifest now contains the JVM + vendor and version according to the jar specification. A new header, + Ant-Version provides the Ant version used to create the jar. + +* <zip> can now store Unix permissions in a way that can be + reconstructed by Info-Zip's unzip command. + +Changes from Ant 1.5.1Beta1 to 1.5.1 +==================================== + +Fixed bugs: +----------- + +* <tstamp>'s prefix attribute failed to apply to nested <format> elements. + +* <junitreport> created an empty junit-noframes.html if no format had + been specified. + +* <basename> would remove more than it should if the file name + contained more than one dot. + +* <filterset>s nested into <filterset>s didn't work. + +Other changes: +-------------- + +* Shipped XML parser is now Xerces 2.2.0 + +* Filesets now support a 'file' attribute, allowing a single-file + fileset to be constructed without having to specify its parent + directory separately. + +* <junit> will now return the result of a call to getName instead of + "unknown" for Test implementations that don't extend TestCase but have + a public String getName() method. + +Changes from Ant 1.5 to 1.5.1Beta1 +================================== + +Fixed bugs: +----------- +* Date/time in CvsChangeLog was in local timezone and 12 hour format leading + to a problem when sorting by time. It is now UTC (GMT) and in 24-hour + format as per cvs 'specifications'. + +* CvsTagDiff now supports ampersand modules or modules that have a different + root directory than their name. + +* EjbJar threw NPEs for the Websphere element. The property 'websphere.home' + was not documented. + +* Mail example in the documentation was not correct. + +* Checksum was broken in the following scenario: + (using verifyproperty OR in a condition) AND using filesets + with multiple files. + +* The ExpandProperties filter threw NPEs when defined using + the <filterreader> format. + +* The sh wrapper script didn't work under Cygwin if ANT_HOME wasn't + set with a Unix style filename. + +* The sh wrapper script could fail if you started Ant from a directory + with whitespace in its name. + +* ant -diagnostics was not working properly when the task dependency + was missing and was just printing the missing dependency. + +* If a task got redefined via <taskdef>, it lost its child elements. + +* <property>'s classpathref attribute was broken. + +* <arg line="''" /> would result in no command line argument, will now + be a single empty argument. Use <arg value="''"/> if you need the + quotes literally. + +* <replaceregexp> could append a newline character at the end of the + file. + +Other changes: +-------------- + +* Appendix E of Java Development with Ant (Loughran/Hatcher) was + contributed to the docs. + +* <available> will only print deprecration warnings if it is actually + used to change the value of a property. + +Changes from Ant 1.5beta3 to Ant 1.5 +==================================== + +Changes that could break older environments: +-------------------------------------------- + +* The filesetmanifest attribute added to <jar> after the 1.4.1 + release has been removed for now. This change may affect only + the 1.5Beta/1.6Alpha users. An attempt will be made to add this + feature back into Ant 1.6. + +Fixed bugs: +----------- + +* <zip> and friends would always update existing archive if you set + the update attribute to true. + +* To support backward compatibility with older versions, <pathconvert> + will once again set the property, even if the result is the empty + string, unless the new 'setonempty' attribute is set to false|no|off + (default is "true"). + +* The manifest task would crash XmlLogger + +Other changes: +-------------- + +* added **/.svn and **/.svn/** to the default excludes + +Changes from Ant 1.5beta2 to Ant 1.5beta3 +========================================= + +Changes that could break older environments: +-------------------------------------------- + +* <pvcs> default filenameformat has been different from Ant 1.4.1. + Now it is different from 1.5beta1 and 1.5beta2. + +* <pathconvert> won't set the property if the result is the empty string. + +Fixed bugs: +----------- + +* <available> could fail to find files or directories that happen to + start with the name of the project's basedir but are not children of + the basedir. + +* Nested <property>'s inside <ant> can now be overriden by subsequent + <ant> and <antcall> tasks. + +* <xslt>'s outputtype attribute wouldn't do anything. + +* <linecontains> filterreader could swallow lines. + +* <sequential> used to configure the tasks (set their attributes) + before the first task has been executed. This means that properties + that have been set by nested task seemed to be unset for the other + tasks in the same <sequential> element. + +* <javac>'s sourcepath setting has been ignored by some compiler + implementations. + +* <javadoc>'s packagelist attribute didn't work. + +* the plain mailer would always use port 25 in <mail>. + +* Ant's default logger could swallow empty lines. + +* ejbjar's iPlanet nested element now can process multiple descriptors. + +* IPlanetEjbc was looking in the wrong place for four iiop files. + +* <javac> would pass the -source switch to JDK 1.3's javac, even + though it doesn't support it. + +Other changes: +-------------- + +* <checksum> now uses a buffer (of configurable size). + +* The "Trying to override task definition" warning has been degraded + to verbose level if the two task definitions only differ in the class + loader instance that has loaded the definition. + +* Add a jvmargs to the ejbjar's weblogic element to allow additional + arguments to be provided to the VM runnign ejbc. Document the + jvmdebuglevel attribute which can be used to avoid warnings about + interface classess being found on the classpath. Document the new + <sysproperty> element which allows JVM properties to be defined. + Added an outputdir attribute to allow the destination to be a + directory into which the exploded jar is written. + +* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5 + +Changes from Ant 1.5beta1 to Ant 1.5beta2 +========================================= + +Changes that could break older environments: +-------------------------------------------- + +* Properties will now be expanded in mail message bodies. This means + that one $ sign will be stripped if your mail message contains the text $$. + +* org.apache.tools.ant.taskdefs.Expand no longer extends MatchingTask. + +* Available#setFile now again uses a File argument as it did in 1.4, + this may break environments that have been adapted to the String + argument version present in 1.5beta1. + +Fixed bugs: +----------- +* When <move> attempts a rename, it deletes the destination file, if it + exists, before renaming the source file. However, <move> was not + checking if the destination file was actually a directory before + trying to delete it. + +* Make CVS Tasks to work under Cygwin. + +* Fix LineContains to handle huge files elegantly without causing + Stack Overflows. + +* if you ask for the "classic" compiler on Java1.4, you get upgraded to + "modern" because there is no classic compiler any more. + +* the <http> condition was viewing 404 'not found' exceptions as success. Now + it defaults to viewing any response >=400 as an error, and has an + errorsBeginAt attribute you can use if you want a higher or lower value. + +* <get> throws a build exception on an http authorization error, unless you + have set ignoreerrors to true. + +* <wsdltodotnet> was spelt in Wintel case: <WsdlToDotnet>. It is now lower + case, though the old spelling is retained for anyone who used it. + +* Merging of Manifests in jar now works as documented. + +* paths that have been separated by colons would be incorrectly parsed + on NetWare. + +* runant.pl now supports NetWare. + +* <tempfile> and <setproxy> tasks were in beta1, but not defined by + default; They now are. <tempfile> fills a property with the name of a + temporary file; <setproxy> lets you set the JVM's http, ftp and socks proxy + settings. + +* <available classname="foo" ignoresystemclasses="true"> failed for + JDK 1.1 and 1.2, even if the class could be found on the + user-specified classpath. + +* <property environment=... /> now works on z/OS. + +* forked <javac> failed for the wrong reason on JDK 1.1 - Ant would + use a temporary file to hold the names of the files to compile under + some conditons, but 1.1 doesn't support this feature. Ant will no + longer try this, but you may run into problems with the length of the + command line now. + +* the refid attribute for <property>s nested into <ant> or <param>s + nested into <antcall> didn't work. + +* <replaceregexp> didn't work for nested <fileset>s. + +* <javadoc> dropped sourcepath entries if no "interesting" .java + source files could be found below them. This has been backwards + incompatible and caused problems with custom doclets like xdoclet. + +* Using the doclet, docletpath or docletpathref attributes of + <javadoc> may have caused NullPointerExceptions. + +* nested <filesets> of <javadoc> would include too much. + +* <dependset> will no longer choke on <targetfileset>s that point to + non-existing directories. + +* <patch> didn't work at all. + +* <replace> and <replaceregexp> now fail if the file they are working + on is locked. + +* <javadoc> would pick up the wrong executable in the combination JDK + 1.2 and AIX. + +Other changes: +-------------- + +* z/OS now gets detected by the os condition. + +* <fileset> and <dirset> now have an optional followsymlink attribute + that can prevent Ant from following symbolic links on some platforms. + +* BeanShell is now supported in the <script> task. + +* <ejbjar> under Weblogic attempts to use the ejbc20 compiler for 2.0 beans + based on the deployment descriptor's DTD reference. Under weblogic 7.00 Beta + this ejbc class has been deprecated. To avoid the deprecation warning use + ejbcclass="weblogic.ejbc". + +* <ejbjar> will add a manifest to the generated jar based on the naming + convention in use. This overrides the manifest specified in the + <ejbjar> attribute + + +Changes from Ant 1.4.1 to 1.5beta1 +================================== + +Changes that could break older environments: +-------------------------------------------- + +* Important: Single $ signs are no longer silently stripped! + Before you panic that we have broken all your build files, we have kept + the old "$$" -> "$" behaviour. So only build files which accidentally had + a $ sign in a string that was being silently stripped may break. + We added this fix to stop newbie confusion; if you want to write a + build file which works on ant versions 1.4.1 or earlier, stay with + the double $$ sign rule. + +* Project.getBuildListeners now returns a clone of the listener + list. Changes to the returned list will not affect the listeners + currently attached to the Project. It also means that it is safe to + iterate over the returned list if listeners are added or removed + during the traversal. + +* <pvcs> default filenameformat has been different from Ant 1.4.1. + +* Some messages that are printed during startup will not be + written to the logfile specified via -logfile as they might destroy + the format of the file for special BuildLoggers (like XmlLogger). + +* The filesetmanifest attribute added to <jar> after the 1.4.1 + release has been removed for now. This change may affect only + the 1.5Beta/1.6Alpha users. An attempt will be made to add this + feature back into Ant 1.6. +* Shipped XML parser is now Xerces 2.0.1 along with the XML Parser APIs. + XML Parser APIs is a separate jar that contains the necessary + JAXP/DOM/SAX classes. + +* <telnet> was fixed to expand properties inside nested <read> and + <write> elements; before this only happened when you assigned the text + to the string attribute. If you had $ signs in the string, they may + need escaping. + +* the RegexpMatcher interface has been extended to support case + insensitive matches and other options - custom implementations of + this interface won't work any longer. We recommend to use the new + Regexp interface that also supports substitution instead of the + RegexpMatcher interface in the future. + +* <gzip> will throw an exception if your src attribute points to a directory. + +* Unjar, Unzip and Unwar will throw an exception if the Src attribute + represents a directory. Support for nested filesets is provided + instead. + +* It is no longer possible to overwrite a property using tasks like + <condition>, <exec>, <pathconvert>, or <tstamp>. In some exceptional + cases it will generate a warning if you attempt to overwrite an + existing property. + +* Taskwriters please note: Whenever tasks had any overloaded set* methods, + Ant's introspection mechanism would select the last overloaded method + provided to it by the Java Runtime. A modification has now been made such + that when the Java Runtime provides a method with a String as its argument, + a check is made to see if there is another overloaded method that takes in + some other type of argument. If there is one such method, then the method + that takes in String as an argument is not selected by the Introspector. + +* The pattern definition **/._* has been included into the Default + Excludes list. + +* <propertyfile>'s <entry> element was modified to remove "never" as a value + as its behavior was undocumented and flakey. + +* The -projecthelp flag now only prints out targets that include the + 'description' attribute, unless the -verbose or -debug flag is included + on the Ant command line. + +* Ant's testcases now require JUnit 3.7 or above, as they now use the new + assertTrue method instead of assert. + +* If the 'output' attribute of <ant> is set to a simple filename or a + relative path, the file is created relative to ${basedir}, not ${user.dir}. + +* The default value for build.compiler is now javac1.x with x + depending on the JDK that is running Ant instead of classic/modern. + +Fixed bugs: +----------- + +* <available> could fail to find files or directories that happen to + start with the name of the project's basedir but are not children of + the basedir. + +* Nested <property>'s inside <ant> can now be overriden by subsequent + <ant> and <antcall> tasks. + +* <xslt>'s outputtype attribute wouldn't do anything. + +* <linecontains> filterreader could swallow lines. + +* <sequential> used to configure the tasks (set their attributes) + before the first task has been executed. This means that properties + that have been set by nested task seemed to be unset for the other + tasks in the same <sequential> element. + +* <javac>'s sourcepath setting has been ignored by some compiler + implementations. + +* <javadoc>'s packagelist attribute didn't work. + +* the plain mailer would always use port 25 in <mail>. + +* Ant's default logger could swallow empty lines. + +* ejbjar's iPlanet nested element now can process multiple descriptors. + +* IPlanetEjbc was looking in the wrong place for four iiop files. + +* <javac> would pass the -source switch to JDK 1.3's javac, even + though it doesn't support it. + +* <zip> and friends would always update existing archive if you set + the update attribute to true. + +* To support backward compatibility with older versions, <pathconvert> + will once again set the property, even if the result is the empty + string, unless the new 'setonempty' attribute is set to false|no|off + (default is "true"). + +* The manifest task would crash XmlLogger + +* A bug existed that prevented generated log files from being deleted as + part of the build process itself. This has now been fixed. + +* Fixed bug where <move> ignored <filterset>s. + +* Ant works properly with the combination of Java1.4/WindowsXP. + +* Fixed bug where <java> used to sometimes invoke class constructors twice. + +* Fixed bug with 4NT shell support. + +* Fixed bug where ant would not perform ftp without remotedir being + specified even though this was not mandatory. + +* Fixed bug where ant would not copy system properties into new Project + in ant/antcall tasks when inheritall="false" is set. + +* <propertyfile> would not close the original property file. + +* <ant> will no longer override a subbuild's basedir with inheritall="true". + +* Fixed problem with the built-in <junit> formatters which assumed + that only one test could be running at the same time - this is not + necessarily true, see junit.extensions.ActiveTestSuite. + +* <jar>'s whenEmpty attribute is useless as JARs are never empty, they + contain at least a manifest file, therefore it will now print a + warning and do nothing. + +* <typedef> hasn't been all that useful as it couldn't be used outside + of targets (it can now) and nested "unknown" elements have always + been considered to be tasks (changed as well). + +* <fixcrlf> would fail for files that contained lines longer than 8kB. + +* Some junit formatters incorrectly assumed that all testcases would + inherit from junit.framework.TestCase. + +* <fixcrlf> dropped the first characters from Mac files. + +Other changes: +-------------- + +* <checksum> now uses a buffer (of configurable size). + +* The "Trying to override task definition" warning has been degraded + to verbose level if the two task definitions only differ in the class + loader instance that has loaded the definition. + +* Add a jvmargs to the ejbjar's weblogic element to allow additional + arguments to be provided to the VM runnign ejbc. Document the + jvmdebuglevel attribute which can be used to avoid warnings about + interface classess being found on the classpath. Document the new + <sysproperty> element which allows JVM properties to be defined. + Added an outputdir attribute to allow the destination to be a + directory into which the exploded jar is written. + +* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5 + +* added **/.svn and **/.svn/** to the default excludes. + +* Selector Elements now provide a way to create filesets based on + sophisticated selection criteria. + +* Gzip and Bzip2 files can now be constructed in the fly when using + the tar task without having to create the intermediate tar file on + disk. The Untar task can also untar GZip and BZip2 files on the fly + without creating the intermediate tar file. + +* New optional type, <classfileset> added. + +* <ejbjar> now allows control over which additional classes and interfaces + are added to the generated EJB jars. A new attribute "dependency" can be + defined which controls what classes are added. The addition of classes now + uses the Jakarta-BCEL library rather than reflection, meaning bean classes are + no longer loaded into Ant's JVM. The default dependency analyzer is known as + the ancestor analyzer. It provides the same behaviour as the 1.4.1 version of + <ejbjar>. If the BCEL library is not present, a warning will be issued stating + the ancestor analyzer is not available. In this case <ejbjar> will continue + to function but will not add super classes to the jar. + +* <available> has a new attribute named ignoreSystemClasses. + +* New task <cvschangelog/> generates an XML report of changes that occur + on CVS repository. + +* New filter readers: ClassConstants, ExpandProperties, HeadFilter, + LineContains, LineContainsRegExp, PrefixLines, ReplaceTokens, + StripJavaComments, StripLineBreaks, StripLineComments, TabsToSpaces, + TailFilter. + +* <copy>, <loadfile>, <loadproperties>, <move> support FilterChains + of FilterReaders. + +* New task <loadproperties> to load contents of file as Ant properties, + with nested <filterchain> elements. + +* New task <loadfile> to load a whole file into a property. + +* New task <echoproperties> to list your current properties to the screen + or a file. + +* New tasks <bzip2> and <bunzip2> to pack and unpack files using the + BZip2 alogrithm. + +* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>, + <manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>, + <concat>, <sourceoffsite>, <jarlib-available>, <jarlib-display>, + <jarlib-manifest>, <jarlib-resolve>. + +* A new combined <mail> task, which replaces the old <mail> and + <mimemail> tasks, has been added. The <mimemail> task, and + old SendEmail and MimeMail classes have been deprecated. + +* Mail task allows specification of port number. + +* Users can control what <zip> and <jar> must do when duplicate files + are found. A new element <zipgroupfileset> allows for multiple zip + files to be merged into the archive. In addition, <jar> also has + another new attribute: filesetmanifest. The existing manifest + attribute of <jar> now also accepts the name of a jar added through + a fileset. + +* gzip now checks that the zipfile is older than the source file + before rebuilding the zipfile. + +* TarFileset takes in three new attributes - fullpath, prefix + and preserveLeadingSlashes. + +* <move> attempts to rename the directory, if everything inside it is + included, before performing file-by-file moves. This attempt will + be done only if filtering is off and if mappers are not used. This + is a performance improvement and there is no change otherwise in + the funtionality of this task. + +* Exec task has extra attribute "resultproperty" to get the return code + into a property. + +* Exec task prints a message when a timed-out process is killed. + +* Added optional attributes - name, arch and version to the <os> task. + +* Unjar, Untar, Unwar and Unzip now support patternsets to + select files from an archive for extraction. Filesets may be + used to select archived files for unarchival. + +* Javac task allows debug levels to be specified. Debug levels + will have an effect only when the modern compiler or the + classic compiler (version 1.2 and higher) is used and debugging + is enabled. + +* Added support for specifying CVS_RSH in the <cvs/> task + +* The attributes zipfile, jarfile, warfile and earfile (from the Zip, + Jar, War and Ear tasks) have been deprecated and superseded by a + new attribute "destfile". + +* Added new conditions <isset>, <checksum>, <http>, <socket>, <contains>, + <filesmatch>. + +* <taskdef> and <typedef> will now emit a warning if a task/type of + the given name already exists. + +* A new revision of VAJ tasks: The most important new feature + is the ability to execute VAJ tasks from the command line by + exploiting the Remote Tool Access feature of VAJ. + +* Improved support for Novell NetWare. + +* Added an optional encoding attribute to <fixcrlf>. + +* <apply> has a new attribute relative that allows users to pass the + filenames as relative instead of absolute paths on the command line. + +* References can now be copied into the child build by <ant> and + <antcall> using nested <reference> elements or the new inheritRefs + attribute. + +* <fail> now supports builds to fail based on conditions via if and + unless attributes. + +* Ant now comes with two new BuildLogger implementations - one that + can send emails containing a log of the build process (MailLogger), + and one that colorizes the output based on message levels, using + ANSI color code escape sequences (AnsiColorLogger). + +* A "package" mapper type has been added to allow package directory + names replaced with the dotted form. + +* You can now specify environment variables in the <java> and <junit> tasks + if the fork attribute has been set to true. + +* -propertyfile command-line option has been added to load an entire + property file just as -D properties are declared (as user properties). + -D properties take precedence over -propertyfile specified ones. + +* You can now set an ANT_ARGS environment variable to hold arguments you + always want passed to the 'ant' command -- for example, if you always + want to use a different logger or the -find flag. + +* <tstamp> now supports a new "prefix" attribute to prefix properties set. + +* You can now specify the -sourcepath for <javac> explicitly. + +* <javac> now supports a new "listfiles" attribute to list the source + files it's handing off to the compiler. + +* The compiler implementation for <javac> can now be chosen on a task by + task basis. The new "compiler" attribute of <javac> can be used to override + the value of the build.compiler property, if set. + +* <javac> has a new nested element, <compilerarg>, which allows you + to specify additional args for the specific compiler you're using. + +* <javac>'s "source" attribute is now enabled for jikes as well. + +* <propertyfile>'s <entry> now has a 'unit' attribute to specify the + increment/decrement unit on date operations. + +* <property> now supports a 'prefix' attribute when loading from a file + or resource. + +* In Ant 1.4, a feature has been added to the <junit> task that would + add ant.jar, optional.jar and junit.jar implicitly to the classpath - + this feature can now be disabled by setting the new includeantruntime + attribute to false. + +* <style> behaves differently from any other directory-based task, as it + processes all files that it finds in included directories in + addition to the files matched by your patterns. There is now a new + attribute, 'scanincludeddirectories', to suppress this behavior. + +* <javadoc> now supports a <tag> nested element to provide the -tag option + to the standard Java 1.4 doclet. The element is ignored when not running + on Java 1.4. + +* <ftp> can now chmod files on a remote server that supports + "site chmod", as well as set the umask before transferring files, if + the server supports "site umask". + +* New <serverdeploy> "optional" task. + +* <patternset> now supports nested patternsets. + +* Perforce tasks now support a "failonerror" attribute (defaults to "true"). + +* Open Source application server JOnAS support: + EJB hot deploy and deploy with <serverdeploy> and <ejbjar> + +* Added new DirSet (<dirset>) datatype. + +* <path> now supports nested <dirset> and <filelist> elements. + +* <pathconvert> now supports nested <dirset> and <filelist> elements. + +* <pathconvert>'s "dirsep" and "pathsep" attributes now accept + multi-character values. + +* <copy> task now has a 'failonerror' attribute to allow keep-going + behaviour when the file to be copied is not found (defaults to "true"). + +* <uptodate> now has a 'srcfile' attribute to allow specifying a + full-path filename. + +* <exec>, <sql> and <java> now support append attributes to allow + appending the output to an existing file. + +* <java> now supports a timeout attribute analog to <exec> - it is + highly recommended to only use it together with fork="true". + +* <javadoc> now supports a source attribute to enable javadoc to + handle assertions present in JDK 1.4 source code. + +* <replace> supports a new replacefilterfile attribute that + automatically turns all properties of a given file into + replacefilters. + +* An alias of <xslt> has been added to refer to the <style> task. + +* The compiler implementation for <rmic> can now be chosen on a task by + task basis. The new "compiler" attribute of <rmic> can be used to override + the value of the build.rmic property, if set. + +* <rmic> has a new nested element, <compilerarg>, which allows you + to specify additional args for the specific compiler you're using. + +* org.apache.tools.ant.XmlLogger now is a BuildLogger, rather than just + a BuildListener. It can operate in either mode successfully. + +* <junit> has a new attribute "showoutput". If set to true, output + generated by tests will be sent to Ant's logging system as well as + to the formatters (instead of sending it to the formatters + exclusively). + +* Ant has now a pluggable way to prompt users for input, which is used + by the new <input> task. IDE integrators can provide an + implementation of the InputHandler interface to decouple Ant's input + from the console. An implementation that gets its input from a file + for unattended builds is part of Ant's distribution. + + For more details see docs/manual/inputhandler.html. + +* <patch> has a new attribute that selects the directory in which to + run the command. + +* <javadoc> now supports two new nested elements, <fileset> and <packageset>. + + +Changes from Ant 1.4 to Ant 1.4.1 +=========================================== + +Fixed bugs: +----------- + +* <ant>'s antfile attribute will now also be considered an absolute path on + Windows systems, if it starts with a \ and no drive specifier. + +* The fullpath attribute of <zipfileset> has been ignored if you used + the src attribute at the same time. + +* The manifest file is now always placed as the second entry (after /META-INF) + in generated jars. This allows the manifest to be read by JarInputStreams + +* Fixed bug in depend task which would fail with a NullPointerException if no + dependency cache was specified. + +* sql task now handles REM statements correctly so that lines starying with rem + but which are not comments are actually processed. + +* XMLLogger now uses the task's name rather than the classname + +* <mapper>s will now work as expected if the to pattern expands to an + absolute pathname. + +* <javac> didn't ignore memory settings in non-fork mode + +* <cab> didn't split the options attribute into several command line + arguments correctly. + +Other changes: +-------------- + +* New source attribute for <javac> to enable assertion in JDK 1.4 + +* XmlLogger and <antstructure> now add an encoding declaration to the + XML files they generate. + +* <fileset> has a new attribute "casesensitive" to make it match + filenames in a case insensitive way (if you set it to false) - by + default filesets remain case sensitive. + +Changes from Ant 1.3 to Ant 1.4 +=========================================== + +Changes that could break older environments: +-------------------------------------------- +* JUnitReport now uses the xalan redirect extension for multi-output. + With Xalan 1.2.2 it forces the use of bsf.jar in the classpath. + (Available in the xalan distribution). It is recommended to switch + to Xalan 2.x that do not need it. + +* Zip.setWhenempty() has changed its signature. + +* <rmic> is now implemented using a factory. This makes extending + rmic to use a new compiler a lot easier but may break custom + versions of this task that rely on the old implementation. + +* several Zip methods have changed their signature as we now use a Zip + package of our own that handles Unix permissions for directories. + Furthermore <zip> will now use the platform's default character + encoding for filenames - this is consistent with the command line + ZIP tools, but causes problems if you try to open them from within + Java and your filenames contain non US-ASCII characters. Use the new + encoding attribute of the task and set it to UTF8 to get the old + behavior. + +* The <pvcs> task has been moved to a package of its own. + +* JUnitResultFormater has two additional methods that must be + implemented by custom formatters. + +* Ant will no longer use the canonical version of a path internally - + this may yield different results on filesystems that support + symbolic links. + +* The output generated by the xml formatter for <junit> has changed + again, it doesn't format the numeric value in the time attribute anymore. + +* Pattern matching rules have changes slightly, the pattern foo* + doesn't match files contained in a directory named foo - use foo/* + instead. + +* <fixcrlf> will not remove trailing whitespace at the end of lines anymore. + +* The Classloader usage has been changed for the taskdef, property, available + and sql tasks so that it delegates to the parent classloader. This may cause + ClassNotFoundExceptions to be thrown if a system class attempts to load a + class in the taskdef's classpath (typically factory objects). + +* Ant now allows multithreading of tasks and the containment of tasks within + other tasks. This can break customer listeners which do not expect messages + from a task before the previous task has finished. + +* Ant now installs its own ouput stream into System.out to route output to the + task currently executing on the current thread. This also means that all + output is now routed as Ant message events. Customer listeners and loggers + should not call System.out at any time. This has always been true but such + usage now will cause problems due to possible recursion. + +* Invalid manifest files will now cause build failures in the <jar> task. + +* Ant Introspection now looks for methods with method names starting with + addConfigured. When called these methods are passed an argument after it has + been configured from the build file. Custom tasks supporting nested elements + starting with the name configured will no longer function. + +* The environment variable JAVACMD that can be used to specify the + java executable to Ant's wrapper scripts must not contain additional + command line parameters any longer - please use the environment + variable ANT_OPTS for such parameters now. + +* Ant's wrapper scripts now quote the CLASSPATH environment variable, thus + supporting classpaths which refer to directories containing spaces. This means + that the CLASSPATH environment variable cannot have quotes. Any quotes should + be removed. This will not affect the operation of the CLASSPATH environment + variable in other contexts. + +* A delete task like + <delete includeEmptyFilesets="true"> + <fileset dir="somedir" /> + </delete> + will now remove "somedir" as well, unless there are still files left + in it (matched by the default excludes). + +* The copy task will now fail if the file to be copied is not found. + +* Ant properties defined in properties files now behave the same way as + properties defined in the build file. In particular the $ character needs + to be escaped in property values by doubling it to $$. So, to define a + property with the value $hello, you need to define it in a properties file + as + test.prop=$$hello + This was not the case in Ant 1.3 + +Other changes: +-------------- + +* New tasks: ear, p4counter, record, cvspass, vsscheckin, vsscheckout, + typedef, sleep, mimemail, set of tasks for Continuus/Synergy, dependset, + condition, maudit, mmetrics, jpcoverage, jpcovreport, jpcovmerge + +* Ant now uses JAXP 1.1 + +* rmic now supports Kaffe's and Weblogic's version of rmic. + +* new magic property build.rmic to chose the rmic implementation + +* <tar> will now add empty directories as well + +* you can now specify a description for <p4change> + +* <touch> can now work on <fileset>s + +* <uptodate> now supports a value attribute + +* <fail> supports nested text + +* <fixcrlf> won't override files that are already in the correct + format. + +* <sql> now supports REM comments as well as // and -- + +* <jar> now has a nested <metainf> element following the same idea as + <war>'s <webinf>. + +* <pvcs> can now handle multiple projects. + +* <available> now has a "type" attribute you can use in conjunction + with the "file" attribute to specify whether the "file" you're + looking for is a file or a directory. + +* New <junit> formatter named "brief" + +* <ejbjar> changes + * Add support for Borland Application Server to the <ejbjar> task using + a <borland> nested element. + * Add support for iPlanet Application Server to the <ejbjar> task. Also + includes some iPlanet utility tasks + * Add support for JBoss Application Server to the <ejbjar> task. + * Add a naming attribute to control the naming scheme that + ejbjar uses to name the generated EJB jars. + * Weblogic element now sets the compiler class for EJB 2.0 beans + * <dtd> elements can be specified at the <ejbjar> level for building generic + beans + * <dtd> elements can now be URLs + * Allow the manifest to be specified for the generated jars + * The weblogic element now supprts an attribte noEJBC to skip the processing + of the jar by ejbc. The ejbc step will then occur at deployment + * weblogic will tell ejbc to use Jikes compiler if build.compiler is set to + jikes. It can be restored to the default, javac, operation if desired. + +* Allow the <sql> Delimiter to be set in the so that Oracle stored procs may be + entered + +* <execon> and <apply> can now optionally skip empty filesets. + +* <javadoc> has a new useexternalfile attribute that makes it use a + temporary file for sourcefile and package names - helps to defeat + command line length limitations. + +* Data types like <path> can now be defined inside of <target>s + +* you can now specify a classpath for <style> - the XSLZ processor + will be loaded from this path + +* added a force attribute to <style> to support dependencies that the + task cannot determine itself (dependency on parameters, not file + modification times for example) + +* added vmlauncher attribute to exec tasks. This defaults to true. If + it is set to false, the VM's ability to launch commands in bypassed + and the OS shell, either directly or through the auxillary antRun + scripts is used. + +* regexp mapper now supports the java.util.regex package of JDK 1.4. + +* New filesonly attribute for <zip> and friends to suppress directory + entries. + +* New update attribute for <zip> and friends - update an existing + archive instead of creating a new one. + +* <apply> and <execon> have been merged into a single task. + +* added vssver.scc to the default excludes + +* <available> has a new filepath attribute/nested element that allows + you top search for a file in a given path. + +* <junit> can now optionally set a property on test failure. + +* <taskdef> can now define several tasks at once, reading the + name/classname pairs from a property file or resource. + +* <unzip/unjar/unwar> and <untar> now have an overwrite attribute that + defaults to true. If set to false, files that are newer than the + files in the archive will not be replaced. + +* <patternset> and <fileset> now support nested <in/excludesfile> + elements - using these you can have more than one in/excludes file + per <patternset>. + +* Three new supported compilers for javac: kjc for kopi, gcj for the + gcc frontend and sj for Symantec's compiler. + In addition extJavac or the new fork attribute can be + used to run the JDK's javac in a JVM separate from Ant. + +* <fixrlf> can now with CR only line-ends and can use an arbitraty + between 2 and 80. + +* The .NET tasks have been adapted to the beta2 release of the framework. + +* <move> will now try to rename() files before copying them byte by + byte - only if filtering is of, of course. + +* <ant> and <antcall> tasks now support a new attribute inheritAll. When set to + false, only user properties are passed through to the target Ant instance. + This includes properties set on the command line and properties explicitly + passed + +* <javadoc> now skips off line links if the package list cannot be found. + +* <wlrun> now allows the security policy file to exist outside the weblogic + directory. + +* <java> task will set the Thread contextClassLoader under JDKs 1.2+ to the + classloader for the class being executed. + +* Introduce the concept of a TaskContainer - a task or element which can contain + Ant Tasks. + +* Add new tasks implementing the TaskContainer interface <parallel> and + <sequential> which allow parallel execution of tasks to be specified. + +* <depend> task will now take into account dependencies on jar files and class + files from a given classpath. + +* <jar> manifest entries may now be specified in the build file either + completely or to be merged with a manifest file. + +* <tstamp> task custom formats now support locales. + +* Added a listner which will forward events to Log4J. The log4j configuration + file should be in the directory from which Ant is run or passed as a system + property using a JVM argument. + +* Introduced the concept of <filtersets> to allow for more control in which + filters get applied in a <copy> or <move> operation. + +* Added nowarn attribute to javac and deprecated the Jikes-magic property + build.compiler.warnings. + +* The <depend> task cache format has changed and all dependency information is + now stored in a single file. + +Fixed bugs: +----------- + +* Testcases have been made independent of current working directory. + +* Input ZIP-Files will be closed when using a <zipfileset>. + +* p4 tasks now don't fail if user, port or client have been omitted + (and this is acceptable for the context of the command). + +* <javah>'s outputfile attribute will be resolved as relative to the + projects basedir. + +* <antstructure> should create a valid DTD for propertyfile.operation.entry + and omit tasks it fails to load. + +* won't try to pass a -bootclasspath flag to javac 1.1 anymore + +* <style>'s style attribute no handles absolute paths correctly. + +* <delete includeemptydirs="true"> now deletes more than just the leaf + directories. + +* You can now specify a <fileset> for a directory that doesn't exist at + declaration time but will created before the fileset gets used for the + first time. + +* If the quiet attribute has been set, <delete> will handle <fileset>s + with non-existing directories gracefully. + +* Output written by testcases will now be captured by the <junit> task + and passed to the formatters. + +* Quote the -group parameter to Javadoc as per the specification + +* Initialise classes when loaded through the AntClassLoader - that is, run + static initializers + +* Implement getResource() and getResources() in AntClassLoader + +* Create the <ejbjar> weblogic command line as a set of arguments rather than + as a single line. Avoids problems with paths which contain spaces. + +* <ejbjar> now fails when the weblogic ejbc compiler reports an error. + +* Make the AntClassLoader load resources in the same order as it currently + loads classes. + +* Handle classpaths with spaces + +* Make sure XSLT processors close their output files in <style>. + +* perform proper uptodate check in <rmic> when compiling for IIOP. + +* <jjtree>'s uptodate test works even if outputdirectory is not the + parent dir of target + +* <copy> will remove target file (if it exists) before writing to it - + this avoids problems with links on filesystems that support them. + +* <ftp> now properly recurses remote directories. + +* <ftp> closes remote connection when it's done. + +* <junit> tries to include all necessary classes for the task itself + to the classpath when running in fork mode - doesn't work for JDK 1.1 + +* <apply> and <execon> do now execute the command only once, if you + specify the parallel attribute - instead of once per fileset. + +* directory based tasks and fileset could miss some included files in + directories that have been excluded + +* <fixcrlf> failed for large files. + +* <move> removed files you tried to move to themselves. + +* <sql> task will not trty to print the result set unless the query succeeded. + +* Ant classloader will now ignore paths which are invalid relative to the + project base + +* <ejbjar> weblogic elements check for jar file changes has been fixed. + Previously some changes would not be included. + +* properties loaded from properties files are now resolved internally. This + removes the spurious warnings about usage of properties which have not been + set. + +* <jar> task and friends now process the JAR manifest to ensure it is valid. + +* The task finished event now includes any exception thrown by the task. + +* <java> task now supports a jvmVersion attribute so that if another JVM is + being used, Ant can determine which options to use for features such as the + VM memory limits + + +Changes from Ant 1.2 to Ant 1.3 +=========================================== + +Changes that could break older environments: +-------------------------------------------- + +* Ant doesn't search for the buildfile anymore, unless you use the new + -find argument. + +* <perforce> has been replaced by a number of new tasks. + +* <javac> is now implemented using a factory. This makes extending + javac to use a new compiler a lot easier but may break custom + versions of this task that rely on the old implementation. + +* The output generated by the xml formatter for <junit> has changed a + little, it doesn't append " sec" in the time attribute anymore. + +Other changes: +-------------- + +* A GUI Frontend: Antidote. This is currently in development. At this + time, this is not part of the Ant release, although the source is + included if you are interested. + +* New tasks: stylebook, propertyfile, depend, antlr, telnet, csc, + ilasm, apply, javah, several clearcase tasks, junitreport, sound + +* Added output attribute to <java>. + +* Added nested zipfileset element to <zip> + +* Changed <sql> so that printing is at the task level rather than + the statement level. + +* javadoc task will pass -d flag to any doclet if the destDir attribute is + given. If the doclet does not accept the -d flag then omit the destdir + attribute. + +* <cab> can work on non-Windows platforms with the help of libcabinet. + See http://trill.cis.fordham.edu/~barbacha/cabinet_library/. + +* <ftp> now supports passive mode. + +* New <mapper> data type that can be used to get influence on the + target files for some tasks like <copy> or enable new types of tasks + like <apply>. + +* <execon> provides more control over the command line now, the names + of the source files are no longer required to be at the end of the + command. + +* Style tasks will now support TraX compliant XSL processors if one is present + in your classpath. + +* Added a failonerror to the javac task. If set to false, the build will + continue even if there are compilation errors. + +* Added nested format elements to the tstamp task allowing additional time + formats to be defined for arbitrary properties. + +* Added classpath attribute and nested classpath element to <property> + to make the resource attribute more powerful. + +* ${} property expansion will now be performed on the patterns read + from files specified as includesfile or excludesfile attributes. + +* The <tar> and <untar> tasks now support GNU format for handling paths + which are greater than 100 characters in length. In addition the <tar> + task now supports nested filesets through which the file permissions + may be controlled. + +* wlrun, wlstop and ejbjar now support Weblogic 6.0 + +* The MPasre task has been updated to work with MParse 2.0 + +* The documentation has been significantly updated. + + +Fixed bugs: +----------- + +* <signjar> no longer uses deprecated methods. + +* javadoc's failonerror attribute works again + +* javadoc's additionalparam attribute will now be split into separate + parameters (on spaces) to allow for more than one parameter. + +* Changed <sql> task so that printing result sets works on Oracle + +* Changes to ddcreator and ejbc helper to respect the descriptor hierarchy + keppgenerated in ejbc can now be turned off + +* ejbjar now correctly ignores <ejb-ref> elements in the deployment descriptor. + CMP files are included by parsing the weblogic deployment descriptor rather + than relying on the naming convention used in ant 1.2 + +* ejbjar includes super classes and super interfaces into the generated ejb + jar files. The <support> nested element allows support classes to be + included in the EJB jar. The toplink element should now correctly locate + the toplink descriptor. + +* <vssget> now correctly deals with spaces in arguments + +* <jar> fails early if a given manifest file doesn't exist + +* <rmic> doesn't search for the _Skel file anymore when stubversion is + set to 1.2. + +* <rmic> uses the the same classpath to verify a class can be rmic'd + as it passes to the compiler. + +* org.apache.tools.mail.MailMessage (and therefore <mail>) can now + handle SMTP servers sending multi line responses. + +* nested <classpath> elements of <taskdef> now work for <taskdef>s not + nested into <target> as well. + +* <property> and <available> will search for the resource "foo" instead + of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource + name foo. + +* Handle build files in directories whose name contained a "#" character + +* <junit> can now log to files whose name contains a comma as well. + +* The AntClassLoader now refers to the loader which loaded it, any + requests it does not handle itself. Previously these went to the + primordial loader. + +Changes from Ant 1.1 to Ant 1.2 +=============================== + +Changes that could break older environments: +-------------------------------------------- + +* Semantics of <property> has changed again in the hope to be more + intuitive. ${} expansion now happens at runtime and <property> tags + living inside of targets only take effect if they are visited at + runtime. + + As a side effect of this change, task's attributes get set at runtime + not at parser time as well, which might change the results of + <script>s or other custom tasks that reference other tasks by their id + attribute. + +* copying of support files in <javac> has been removed - as well as + the filtering attribute. + +* the <expand> and <keysubst> tasks have been removed. + +* the ignore and items attributes of directory based tasks have been removed. + +* the command line switches _not_ starting with - have been removed. + +* Path and EnumeratedAttribute have been moved from + org.apache.tools.ant to org.apache.tools.ant.types. + +* the class attributes of <available>, <java>, <rmic> and <taskdef> + have been removed. + +* the src attribute of <chmod> has been removed. + +* <patch> and <javadoc> have lost some of their attributes. + +* <java> and <cvs> have lost some undocumented attributes. + +* the Unix antRun script would search for command.sh in the directory + it changed to and invoke this instead of command if present. This + behavior has been dropped. + +* <ejbjar> task syntax has been changed significantly + +* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec. + Custom tasks that rely on Project.createTask("exec") to return an + instance of this class are going to fail. + +* nested <include> and <exclude> elements expect the value of their + name attribute to be a single pattern, they don't accept multiple + patterns anymore. Split them into multiple elements of the same type. + +* <delete dir="somedir" /> will now delete the directory itself as + well as all included files. If you just want to clean out the + directory and keep the empty one, use a nested fileset. + +Other changes: +-------------- + +* New tasks: antstructure, cab, execon, fail, ftp, genkey, jlink, + junit, sql, javacc, jjtree, starteam, war, unwar, uptodate, + native2ascii, copy, move, mparse. + +* copydir, copyfile, deltree and rename are now deprecated. They + should be replaced with the new copy, delete and move tasks. + +* <java> uses a ClassLoader of its own in no-fork mode if a classpath is + specified. + +* <style> will create the necessary target directories and reprocess + all files if the stylesheet changes. + +* New data types fileset and patternset - expected to get a broader use. + They, as well as PATH like structures, can now be defined on a global + level and later be referenced by their id attribute. + +* You can specify environment variables to <exec>. + +* <get> can check whether a remote file is actually newer than a local + copy before it starts a download (HTTP only). + +* Added a -logger option to allow the class which performs logging to be + specified on the command line. + +* Added a -emacs option to tell the logger to leave out taskname adornments + on log output. + +* <chmod> works on all files in parallel and supports multiple filesets. + +* <replace> can now use tokens and/or values that cross line boundaries. + +* build.compiler supports now jvc as well. + +* project specific help can now be obtained with the -projecthelp option. + +* Added a -debug option to make -verbose less verbose (and more useful) + +* Ant will now search for a file named build.xml in the parent directory + and above (towards the root of the filesystem) if you didn't specify + -buildfile and there is no build.xml in the current directory. + +* <echo> can now write to a file and accepts nested text. + +Fixed bugs: +----------- + +* <chmod> didn't work when used as a directory based task. + +* Path, Available, Property didn't resolve relative filenames with + respect to the Project's basedir. + +* Project didn't interpret the basedir attribute correctly in all + cases. + +* Nested <src> in <javac> caused NullPointerException. + +* Corrupt Zip- and Jar-files ar now deleted if the task fails. + +* many more fixes we've forgotten to document here ... + +* The packagelistloc attribute of <javadoc>'s <link> child will be + resolved as a file (i.e. it is either absolute or relative to + basedir). Added: trunk/tools/ant/bin/ant =================================================================== --- trunk/tools/ant/bin/ant (rev 0) +++ trunk/tools/ant/bin/ant 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,326 @@ +#! /bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Extract launch and ant arguments, (see details below). +ant_exec_args= +no_config=false +use_jikes_default=false +ant_exec_debug=false +show_help=false +for arg in "$@" ; do + if [ "$arg" = "--noconfig" ] ; then + no_config=true + elif [ "$arg" = "--usejikes" ] ; then + use_jikes_default=true + elif [ "$arg" = "--execdebug" ] ; then + ant_exec_debug=true + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then + show_help=true + ant_exec_args="$ant_exec_args -h" + else + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then + show_help=true + fi + ant_exec_args="$ant_exec_args \"$arg\"" + fi +done + +# Source/default ant configuration +if $no_config ; then + rpm_mode=false + usejikes=$use_jikes_default +else + # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) + if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then + if [ -f "/etc/ant.conf" ] ; then + . /etc/ant.conf + fi + fi + + # load user ant configuration + if [ -f "$HOME/.ant/ant.conf" ] ; then + . $HOME/.ant/ant.conf + fi + if [ -f "$HOME/.antrc" ] ; then + . "$HOME/.antrc" + fi + + # provide default configuration values + if [ -z "$rpm_mode" ] ; then + rpm_mode=false + fi + if [ -z "$usejikes" ] ; then + usejikes=$use_jikes_default + fi +fi + +# Setup Java environment in rpm mode +if $rpm_mode ; then + if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions + set_jvm + set_javacmd + fi +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; + Darwin*) darwin=true + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home + fi + ;; +esac + +if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then + ## resolve links - $0 may be a link to ant's home + PRG="$0" + progname=`basename "$0"` + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi + done + + ANT_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd` +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$ANT_HOME" ] && + ANT_HOME=`cygpath --unix "$ANT_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# set ANT_LIB location +ANT_LIB="${ANT_HOME}/lib" + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + JAVACMD="$JAVA_HOME/jre/sh/java" + elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then + JAVACMD="$JAVA_HOME/jre/bin/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD=`which java 2> /dev/null ` + if [ -z "$JAVACMD" ] ; then + JAVACMD=java + fi + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." + echo " We cannot execute $JAVACMD" + exit 1 +fi + +# Build local classpath using just the launcher in non-rpm mode or +# use the Jpackage helper in rpm mode with basic and default jars +# specified in the ant.conf configuration. Because the launcher is +# used, libraries linked in ANT_HOME/lib will also be included, but this +# is discouraged as it is not java-version safe. A user should +# request optional jars and their dependencies via the OPT_JAR_LIST +# variable +if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then + LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" + + # If no optional jars have been specified then build the default list + if [ -z "$OPT_JAR_LIST" ] ; then + for file in /etc/ant.d/*; do + if [ -f "$file" ]; then + case "$file" in + *~) ;; + *#*) ;; + *.rpmsave) ;; + *.rpmnew) ;; + *) + for dep in `cat "$file"`; do + case "$OPT_JAR_LIST" in + *"$dep"*) ;; + *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" + esac + done + esac + fi + done + fi + + # If the user requested to try to add some other jars to the classpath + if [ -n "$OPT_JAR_LIST" ] ; then + _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" + if [ -n "$_OPTCLASSPATH" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" + fi + fi + + # Explicitly add javac path to classpath, assume JAVA_HOME set + # properly in rpm mode + if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar" + fi + if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip" + fi + + # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be + # user CLASSPATH first and ant-found jars after. + # In that case, the user CLASSPATH will override ant-found jars + # + # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour + # with ant-found jars first and user CLASSPATH after + if [ -n "$CLASSPATH" ] ; then + # merge local and specified classpath + if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH="$CLASSPATH" + elif [ -n "$CLASSPATH_OVERRIDE" ] ; then + LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH" + else + LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH" + fi + + # remove class path from launcher -cp option + CLASSPATH="" + fi +else + # not using rpm_mode; use launcher to determine classpaths + if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar + else + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH + fi +fi + +if [ -n "$JAVA_HOME" ] ; then + # OSX hack to make Ant work with jikes + if $darwin ; then + OSXHACK="${JAVA_HOME}/../Classes" + if [ -d "${OSXHACK}" ] ; then + for i in "${OSXHACK}"/*.jar + do + JIKESPATH="$JIKESPATH:$i" + done + fi + fi +fi + +# Allow Jikes support (off by default) +if $usejikes; then + ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" +fi + +# For Cygwin, switch paths to appropriate format before running java +# For PATHs convert to unix format first, then to windows format to ensure +# both formats are supported. Probably this will fail on directories with ; +# in the name in the path. Let's assume that paths containing ; are more +# rare than windows style paths on cygwin. +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + ANT_HOME=`cygpath --$format "$ANT_HOME"` + ANT_LIB=`cygpath --$format "$ANT_LIB"` + JAVA_HOME=`cygpath --$format "$JAVA_HOME"` + LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"` + LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"` + if [ -n "$CLASSPATH" ] ; then + CP_TEMP=`cygpath --path --unix "$CLASSPATH"` + CLASSPATH=`cygpath --path --$format "$CP_TEMP"` + fi + CYGHOME=`cygpath --$format "$HOME"` +fi + +# Show script help if requested +if $show_help ; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' + echo 'Script Options:' + echo ' --help, --h print this message and ant help' + echo ' --noconfig suppress sourcing of /etc/ant.conf,' + echo ' $HOME/.ant/ant.conf, and $HOME/.antrc' + echo ' configuration files' + echo ' --usejikes enable use of jikes by default, unless' + echo ' set explicitly in configuration files' + echo ' --execdebug print ant exec line generated by this' + echo ' launch script' + echo ' ' +fi +# add a second backslash to variables terminated by a backslash under cygwin +if $cygwin; then + case "$ANT_HOME" in + *\\ ) + ANT_HOME="$ANT_HOME\\" + ;; + esac + case "$CYGHOME" in + *\\ ) + CYGHOME="$CYGHOME\\" + ;; + esac + case "$JIKESPATH" in + *\\ ) + JIKESPATH="$JIKESPATH\\" + ;; + esac + case "$LOCALCLASSPATH" in + *\\ ) + LOCALCLASSPATH="$LOCALCLASSPATH\\" + ;; + esac + case "$CLASSPATH" in + *\\ ) + CLASSPATH="$CLASSPATH\\" + ;; + esac +fi +# Execute ant using eval/exec to preserve spaces in paths, +# java options, and ant args +ant_sys_opts= +if [ -n "$CYGHOME" ]; then + if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\"" + else + ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\"" + fi +else + if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" + fi +fi +ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args" +if $ant_exec_debug ; then + echo $ant_exec_command +fi +eval $ant_exec_command Property changes on: trunk/tools/ant/bin/ant ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/ant.bat =================================================================== --- trunk/tools/ant/bin/ant.bat (rev 0) +++ trunk/tools/ant/bin/ant.bat 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,226 @@ +@echo off + +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +REM This is an inordinately troublesome piece of code, particularly because it +REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x +REM support, things would be much easier, but sadly, it is not yet time. +REM Be cautious about editing this, and only add WinNT specific stuff in code that +REM only runs on WinNT. + +if "%HOME%"=="" goto homeDrivePathPre +if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat" + +:homeDrivePathPre +if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre +if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre +if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" + +:userProfilePre +if "%USERPROFILE%"=="" goto alpha +if "%USERPROFILE%"=="%HOME%" goto alpha +if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha +if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat" + +:alpha + +if "%OS%"=="Windows_NT" @setlocal +if "%OS%"=="WINNT" @setlocal + +if "%ANT_HOME%"=="" goto setDefaultAntHome + +:stripAntHome +if not _%ANT_HOME:~-1%==_\ goto checkClasspath +set ANT_HOME=%ANT_HOME:~0,-1% +goto stripAntHome + +:setDefaultAntHome +rem %~dp0 is expanded pathname of the current script under NT +set ANT_HOME=%~dp0.. + +:checkClasspath +set _USE_CLASSPATH=yes +rem CLASSPATH must not be used if it is equal to "" +if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no +if "%CLASSPATH%"=="" set _USE_CLASSPATH=no + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). +set ANT_CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +if ""%1""==""-noclasspath"" goto clearclasspath +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem here is there is a -noclasspath in the options +:clearclasspath +set _USE_CLASSPATH=no +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + +if _USE_CLASSPATH==no goto findAntHome + +:stripClasspath +if not _%CLASSPATH:~-1%==_\ goto findAntHome +set CLASSPATH=%CLASSPATH:~0,-1% +goto stripClasspath + +:findAntHome +rem find ANT_HOME if it does not exist due to either an invalid value passed +rem by the user or the %0 problem on Windows 9x +if exist "%ANT_HOME%\lib\ant.jar" goto checkJava + +rem check for ant in Program Files +if not exist "%ProgramFiles%\ant" goto checkSystemDrive +set ANT_HOME=%ProgramFiles%\ant +goto checkJava + +:checkSystemDrive +rem check for ant in root directory of system drive +if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive +set ANT_HOME=%SystemDrive%\ant +goto checkJava + +:checkCDrive +rem check for ant in C:\ant for Win9X users +if not exist C:\ant\lib\ant.jar goto noAntHome +set ANT_HOME=C:\ant +goto checkJava + +:noAntHome +echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME. +goto end + +:checkJava +set _JAVACMD=%JAVACMD% + +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe +goto checkJikes + +:noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=java.exe + +:checkJikes +if not "%JIKESPATH%"=="" goto runAntWithJikes + +:runAnt +if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath +:runAntWithClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntNoClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntWithJikes + +if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath +set JIKESPATH=%JIKESPATH:~0,-1% +goto runAntWithJikes + +:checkJikesAndClasspath + +if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath + +:runAntWithJikesAndClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntWithJikesNoClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:onError +rem Windows 9x way of checking the error code. It matches via brute force. +for %%i in (1 10 100) do set err%%i= +for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i +if %err100%==2 goto onError200 +if %err100%==0 set err100= +for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i +if "%err100%"=="" if %err10%==0 set err10= +:onError1 +for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i +goto onErrorEnd +:onError200 +for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i +if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i +if not err10==5 goto onError1 +:onErrorEnd +set ANT_ERROR=%err100%%err10%%err1% +for %%i in (1 10 100) do set err%%i= + +:end +rem bug ID 32069: resetting an undefined env variable changes the errorlevel. +if not "%_JAVACMD%"=="" set _JAVACMD= +if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS= + +if "%ANT_ERROR%"=="0" goto mainEnd + +rem Set the return code if we are not in NT. We can only set +rem a value of 1, but it's better than nothing. +if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 + +rem Set the ERRORLEVEL if we are running NT. +if "%OS%"=="Windows_NT" color 00 + +goto omega + +:mainEnd + +rem If there were no errors, we run the post script. +if "%OS%"=="Windows_NT" @endlocal +if "%OS%"=="WINNT" @endlocal + +if "%HOME%"=="" goto homeDrivePathPost +if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat" + +:homeDrivePathPost +if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost +if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost +if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" + +:userProfilePost +if "%USERPROFILE%"=="" goto omega +if "%USERPROFILE%"=="%HOME%" goto omega +if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega +if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat" + +:omega + Added: trunk/tools/ant/bin/ant.cmd =================================================================== --- trunk/tools/ant/bin/ant.cmd (rev 0) +++ trunk/tools/ant/bin/ant.cmd 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,93 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Run ant +*/ + +'@echo off' +parse arg mode envarg '::' antarg + +if mode\='.' & mode\='..' & mode\='/' then do + envarg = mode envarg + mode = '' +end + +if antarg = '' then do + antarg = envarg + envarg = '' +end + +x = setlocal() + +env="OS2ENVIRONMENT" +antenv = _getenv_('antenv') +if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"' + +if mode = '' then mode = _getenv_('ANT_MODE' '..') +if mode \= '/' then do + runrc = _getenv_('runrc') + antrc = _getenv_('antrc' 'antrc.cmd') + if mode = '..' then mode = '-r' + else mode = '' + interpret 'call "' || runrc || '"' antrc '"' || mode || '"' +end + +if _testenv_() = 0 then do + say 'Ant environment is not set properly' + x = endlocal() + exit 16 +end + +settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME + +java = _getenv_('javacmd' 'java') +opts = value('ANT_OPTS',,env) +args = value('ANT_ARGS',,env) +lcp = value('LOCALCLASSPATH',,env) +cp = value('CLASSPATH',,env) +if value('ANT_USE_CP',,env) \= '' then do + if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';' + lcp = lcp || cp + 'SET CLASSPATH=' +end +if lcp\='' then lcp = '-classpath' lcp + +cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg +launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists') +if launcher = '' then entry = 'org.apache.tools.ant.Main' +else entry = 'org.apache.tools.ant.launch.Launcher' +java opts lcp entry settings args antarg + +x = endlocal() + +return rc + +_testenv_: procedure expose env ANT_HOME JAVA_HOME +ANT_HOME = value('ANT_HOME',,env) +if ANT_HOME = '' then return 0 +JAVA_HOME = value('JAVA_HOME',,env) +if JAVA_HOME = '' then return 0 +cp = translate(value('CLASSPATH',,env)) +if pos(translate(ANT_HOME), cp) = 0 then return 0 +if pos(translate(JAVA_HOME), cp) = 0 then return 0 +return 1 + +_getenv_: procedure expose env +parse arg envar default +if default = '' then default = envar +var = value(translate(envar),,env) +if var = '' then var = default +return var Added: trunk/tools/ant/bin/antRun =================================================================== --- trunk/tools/ant/bin/antRun (rev 0) +++ trunk/tools/ant/bin/antRun 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,24 @@ +#! /bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Args: DIR command +cd "$1" +CMD="$2" +shift +shift + +exec "$CMD" "$@" Property changes on: trunk/tools/ant/bin/antRun ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/antRun.bat =================================================================== --- trunk/tools/ant/bin/antRun.bat (rev 0) +++ trunk/tools/ant/bin/antRun.bat 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,50 @@ +@echo off + +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +if "%OS%"=="Windows_NT" @setlocal +if "%OS%"=="WINNT" @setlocal + +if ""%1""=="""" goto runCommand + +rem Change drive and directory to %1 +if "%OS%"=="Windows_NT" goto nt_cd +if "%OS%"=="WINNT" goto nt_cd +cd ""%1"" +goto end_cd +:nt_cd +cd /d ""%1"" +:end_cd +shift + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). +set ANT_RUN_CMD=%1 +if ""%1""=="""" goto runCommand +shift +:loop +if ""%1""=="""" goto runCommand +set ANT_RUN_CMD=%ANT_RUN_CMD% %1 +shift +goto loop + +:runCommand +rem echo %ANT_RUN_CMD% +%ANT_RUN_CMD% + +if "%OS%"=="Windows_NT" @endlocal +if "%OS%"=="WINNT" @endlocal + Added: trunk/tools/ant/bin/antRun.pl =================================================================== --- trunk/tools/ant/bin/antRun.pl (rev 0) +++ trunk/tools/ant/bin/antRun.pl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,66 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +####################################################################### +# +# antRun.pl +# +# wrapper script for invoking commands on a platform with Perl installed +# this is akin to antRun.bat, and antRun the SH script +# +# created: 2001-10-18 +# author: Jeff Tulley jtulley(a)novell.com +####################################################################### +#be fussy about variables +use strict; + +#turn warnings on during dev; generates a few spurious uninitialised var access warnings +#use warnings; + +#and set $debug to 1 to turn on trace info (currently unused) +my $debug=1; + +####################################################################### +# change drive and directory to "%1" +my $ANT_RUN_CMD = @ARGV[0]; + +# assign current run command to "%2" +chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n"; +if ($^O eq "NetWare") { + # There is a bug in Perl 5 on NetWare, where chdir does not + # do anything. On NetWare, the following path-prefixed form should + # always work. (afaict) + $ANT_RUN_CMD .= "/".@ARGV[1]; +} +else { + $ANT_RUN_CMD = @ARGV[1]; +} + +# dispose of the first two arguments, leaving only the command's args. +shift; +shift; + +# run the command +my $returnValue = system $ANT_RUN_CMD, @ARGV; +if ($returnValue eq 0) { + exit 0; +} +else { + # only 0 and 1 are widely recognized as exit values + # so change the exit value to 1 + exit 1; +} Property changes on: trunk/tools/ant/bin/antRun.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/antenv.cmd =================================================================== --- trunk/tools/ant/bin/antenv.cmd (rev 0) +++ trunk/tools/ant/bin/antenv.cmd 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,98 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +'@echo off' +call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs" +call SysLoadFuncs + +/* Prepare the parameters for later use */ +parse arg argv +mode = '' +args = '' +opts = '' +cp = '' +lcp = '' + +do i = 1 to words(argv) + param = word(argv, i) + select + when param='-lcp' then mode = 'l' + when param='-cp' | param='-classpath' then mode = 'c' + when abbrev('-opts', param, 4) then mode = 'o' + when abbrev('-args', param, 4) then mode = 'a' + otherwise + select + when mode = 'a' then args = space(args param, 1) + when mode = 'c' then cp = space(cp param, 1) + when mode = 'l' then lcp = space(lcp param, 1) + when mode = 'o' then opts = space(opts param, 1) + otherwise + say 'Option' param 'ignored' + end + end +end + +env="OS2ENVIRONMENT" +antconf = _getenv_('antconf' 'antconf.cmd') +runrc = _getenv_('runrc') +interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC' +ANT_HOME = value('ANT_HOME',,env) +JAVA_HOME = value('JAVA_HOME',,env) +classpath = value('CLASSPATH',,env) +classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS") +if classes \= '' then classpath = prepend(classpath classes) +classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS") +if classes \= '' then classpath = prepend(classpath classes) + +classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar') +'SET CLASSPATH=' || classpath + +/* Setting classpathes, options and arguments */ +envset = _getenv_('envset') +if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"' +if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"' +if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"' +if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"' + +exit 0 + +addpath: procedure +parse arg path elem +if elem = '' then do + if path\='' & right(path, 1)\=';' then path = path || ';' + return path +end +if substr(path, length(path)) = ';' then glue = '' +else glue = ';' +if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';' +return path + +prepend: procedure +parse arg path elem +if elem = '' then do + if path\='' & right(path, 1)\=';' then path = path || ';' + return path +end +if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path +return path + +_getenv_: procedure expose env +parse arg envar default +if default = '' then default = envar +var = value(translate(envar),,env) +if var = '' then var = default +return var Added: trunk/tools/ant/bin/complete-ant-cmd.pl =================================================================== --- trunk/tools/ant/bin/complete-ant-cmd.pl (rev 0) +++ trunk/tools/ant/bin/complete-ant-cmd.pl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,114 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# A script to allow Bash or Z-Shell to complete an Ant command-line. +# +# To install for Bash 2.0 or better, add the following to ~/.bashrc: +# +# $ complete -C complete-ant-cmd ant build.sh +# +# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc: +# +# function ant_complete () { +# local args_line args +# read -l args_line +# set -A args $args_line +# set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1) +# } +# compctl -K ant_complete ant build.sh +# +# @author Mike Williams <mikew(a)cortexebusiness.com.au> + +my $cmdLine = $ENV{'COMP_LINE'}; +my $antCmd = $ARGV[0]; +my $word = $ARGV[1]; + +my @completions; +if ($word =~ /^-/) { + list( restrict( $word, getArguments() )); +} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) { + list( getBuildFiles($word) ); +} else { + list( restrict( $word, getTargets() )); +} + +exit(0); + +sub list { + for (@_) { + print "$_\n"; + } +} + +sub restrict { + my ($word, @completions) = @_; + grep( /^\Q$word\E/, @completions ); +} + +sub getArguments { + qw(-buildfile -debug -emacs -f -find -help -listener -logfile + -logger -projecthelp -quiet -verbose -version); +} + + +sub getBuildFiles { + my ($word) = @_; + grep( /\.xml$/, glob( "$word*" )); +} + +sub getTargets { + + # Look for build-file + my $buildFile = 'build.xml'; + if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) { + $buildFile = $2; + } + return () unless (-f $buildFile); + + # Run "ant -projecthelp" to list targets. Keep a cache of results in a + # cache-file. + my $cacheFile = $buildFile; + $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|; + if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) { + open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n"; + open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return(); + my %targets; + while( <HELP> ) { + if (/^\s+(\S+)/) { + $targets{$1}++; + } + } + my @targets = sort keys %targets; + for (@targets) { print CACHE "$_\n"; } + return @targets; + } + + # Read the target-cache + open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n"; + my @targets; + while (<CACHE>) { + chop; + s/\r$//; # for Cygwin + push( @targets, $_ ); + } + close( CACHE ); + @targets; + +} + + + Property changes on: trunk/tools/ant/bin/complete-ant-cmd.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/envset.cmd =================================================================== --- trunk/tools/ant/bin/envset.cmd (rev 0) +++ trunk/tools/ant/bin/envset.cmd 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,131 @@ +/* + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +SET environment variables +First optional parameter: + ; parameters are considered parts of a path variable, semicolons are + appended to each element if not already present + -D parameters are properties for Java or Makefile etc., -D will be + prepended and the parameters will be separated by a space + =D the same as above but equal sign is not required + , parameters should be comma separated in the environment variable + - parameters should be separated by the next parameter + Other values mean that the first parameter is missing and the environment + variable will be set to the space separated parameters + +Second parameter: name of the environment variable + +Next parameters: values +; implies that the equal sign is considered a part of the parameter and is +not interpreted + +-D requires parameters in the form name=value. If the equal sign is not found, +the parameters are changed to name=expanded_name + +Other options have optional equal sign. If it is found, only the part after +the equal sign will be oprionally expanded. + +If the parameter is the minus sign, the next parameter will not be expanded. +If the parameter is a single dot, it will be replaced with the value of the +environment variable as it existed before envset was invoked. + +For other parameters the batch looks for the environment variable with the +same name (in uppercase). If it is found, it forms the expanded_name. If +the environment variable with such a name does not exist, the expanded_name +will hold the parameter name without case conversion. +*/ + +parse arg mode envar args + +equal = 0 +sep = ' ' + +/* Parse command line parameters */ +select + when mode='-' then do + sep = envar + parse var args envar args + end + when mode=';' then do + sep = '' + equal = -1 + end + when mode='-D' then equal = 1 + when mode='=D' then mode = '-D' + when mode=',' then sep = ',' +otherwise + args = envar args + envar = mode + mode = '' +end + +env = 'OS2ENVIRONMENT' +envar = translate(envar) +orig = value(envar,,env) +newval = '' +expand = 1 + +/* for each parameter... */ +do i = 1 to words(args) + if expand > 0 & word(args, i) = '-' then expand = 0 + else call addval word(args, i) +end + +/* Optionally enclose path variable by quotes */ +if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"' + +/* Set the new value, 'SET' cannot be used since it does not allow '=' */ +x = value(envar, newval, env) +exit 0 + +addval: procedure expose sep equal orig expand newval mode env +parse arg var + +if var = '.' then expvar = orig +else do + if equal >= 0 then do + parse var var name '=' val + if val = '' then var = name + else var = val + end + if expand = 0 then expvar = var + else expvar = value(translate(var),,env) + if expvar = '' then expvar = var + if equal >= 0 then do + if val = '' then do + parse var expvar key '=' val + if val <> '' then name = key + else do + if equal > 0 then val = key + else name = key + end + end + else val = expvar + if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"' + if val = '' then expvar = name + else expvar = name || '=' || val + end + if mode = '-D' then expvar = '-D' || expvar + if mode = ';' then do + if right(expvar, 1) <> ';' then expvar = expvar || ';' + end +end + +if newval = '' then newval = expvar +else newval = newval || sep || expvar +expand = 1 +return Added: trunk/tools/ant/bin/lcp.bat =================================================================== --- trunk/tools/ant/bin/lcp.bat (rev 0) +++ trunk/tools/ant/bin/lcp.bat 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,31 @@ +REM +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM +REM + +set _CLASSPATHCOMPONENT=%1 +if ""%1""=="""" goto gotAllArgs +shift + +:argCheck +if ""%1""=="""" goto gotAllArgs +set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1 +shift +goto argCheck + +:gotAllArgs +set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT% + Added: trunk/tools/ant/bin/runant.pl =================================================================== --- trunk/tools/ant/bin/runant.pl (rev 0) +++ trunk/tools/ant/bin/runant.pl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,153 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +####################################################################### +# +# runant.pl +# +# wrapper script for invoking ant in a platform with Perl installed +# this may include cgi-bin invocation, which is considered somewhat daft. +# (slo: that should be a separate file which can be derived from this +# and returns the XML formatted output) +# +# the code is not totally portable due to classpath and directory splitting +# issues. oops. (NB, use File::Spec::Functions will help and the code is +# structured for the catfile() call, but because of perl version funnies +# the code is not included. +# +# created: 2000-8-24 +# author: Steve Loughran steve_l(a)sourceforge.net +####################################################################### +# +# Assumptions: +# +# - the "java" executable/script is on the command path +# - ANT_HOME has been set +# - target platform uses ":" as classpath separator or perl indicates it is dos/win32 +# - target platform uses "/" as directory separator. + +#be fussy about variables +use strict; + +#platform specifics (disabled) +#use File::Spec::Functions; + +#turn warnings on during dev; generates a few spurious uninitialised var access warnings +#use warnings; + +#and set $debug to 1 to turn on trace info +my $debug=1; + +####################################################################### +# +# check to make sure environment is setup +# + +my $HOME = $ENV{ANT_HOME}; +if ($HOME eq "") + { + die "\n\nANT_HOME *MUST* be set!\n\n"; + } + +my $JAVACMD = $ENV{JAVACMD}; +$JAVACMD = "java" if $JAVACMD eq ""; + +my $onnetware = 0; +if ($^O eq "NetWare") +{ + $onnetware = 1; +} + +my $oncygwin = ($^O eq "cygwin"); + +#ISSUE: what java wants to split up classpath varies from platform to platform +#and perl is not too hot at hinting which box it is on. +#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed. +my $s=":"; +if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") || + ($onnetware == 1)) + { + $s=";"; + } + +#build up standard classpath +my $localpath = "$HOME/lib/ant-launcher.jar"; +#set JVM options and Ant arguments, if any +my @ANT_OPTS=split(" ", $ENV{ANT_OPTS}); +my @ANT_ARGS=split(" ", $ENV{ANT_ARGS}); + +#jikes +if($ENV{JIKESPATH} ne "") + { + push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}"; + } + +#construct arguments to java +my @ARGS; +push @ARGS, @ANT_OPTS; + +my $CYGHOME = ""; + +my $classpath=$ENV{CLASSPATH}; +if ($oncygwin == 1) { + $localpath = `cygpath --path --windows $localpath`; + chomp ($localpath); + if (! $classpath eq "") + { + $classpath = `cygpath --path --windows "$classpath"`; + chomp ($classpath); + } + $HOME = `cygpath --path --windows $HOME`; + chomp ($HOME); + $CYGHOME = `cygpath --path --windows $ENV{HOME}`; + chomp ($CYGHOME); +} +push @ARGS, "-classpath", "$localpath"; +push @ARGS, "-Dant.home=$HOME"; +if ( ! $CYGHOME eq "" ) +{ + push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\"" +} +push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS; +push @ARGS, @ARGV; +if (! $classpath eq "") +{ + if ($onnetware == 1) + { + # make classpath literally $CLASSPATH + # this is to avoid pushing us over the 512 character limit + # even skip the ; - that is already in $localpath + push @ARGS, "-lib", "\$CLASSPATH"; + } + else + { + push @ARGS, "-lib", "$classpath"; + } +} +print "\n $JAVACMD @ARGS\n\n" if ($debug); + +my $returnValue = system $JAVACMD, @ARGS; +if ($returnValue eq 0) + { + exit 0; + } +else + { + # only 0 and 1 are widely recognized as exit values + # so change the exit value to 1 + exit 1; + } Property changes on: trunk/tools/ant/bin/runant.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/runant.py =================================================================== --- trunk/tools/ant/bin/runant.py (rev 0) +++ trunk/tools/ant/bin/runant.py 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,102 @@ +#!/usr/bin/python +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +""" + + runant.py + + This script is a translation of the runant.pl written by Steve Loughran. + It runs ant with/out arguments, it should be quite portable (thanks to + the python os library) + This script has been tested with Python2.0/Win2K + + created: 2001-04-11 + author: Pierre Dittgen pierre.dittgen(a)criltelecom.com + + Assumptions: + + - the "java" executable/script is on the command path +""" +import os, os.path, string, sys + +# Change it to 1 to get extra debug information +debug = 0 + +####################################################################### + +# If ANT_HOME is not set default to script's parent directory +if os.environ.has_key('ANT_HOME'): + ANT_HOME = os.environ['ANT_HOME'] +else: + ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) + +# set ANT_LIB location +ANT_LIB = os.path.join(ANT_HOME, 'lib') + +# set JAVACMD (check variables JAVACMD and JAVA_HOME) +JAVACMD = None +if not os.environ.has_key('JAVACMD'): + if os.environ.has_key('JAVA_HOME'): + if not os.path.exists(os.environ['JAVA_HOME']): + print "Warning: JAVA_HOME is not defined correctly." + else: + JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java') + else: + print "Warning: JAVA_HOME not set." +else: + JAVACMD = os.environ['JAVACMD'] +if not JAVACMD: + JAVACMD = 'java' + +launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar') +if not os.path.exists(launcher_jar): + print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \ + ANT_LIB + +# Build up standard classpath (LOCALCLASSPATH) +LOCALCLASSPATH = launcher_jar +if os.environ.has_key('LOCALCLASSPATH'): + LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH'] + +ANT_OPTS = "" +if os.environ.has_key('ANT_OPTS'): + ANT_OPTS = os.environ['ANT_OPTS'] + +OPTS = "" +if os.environ.has_key('JIKESPATH'): + OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH'] + +ANT_ARGS = "" +if os.environ.has_key('ANT_ARGS'): + ANT_ARGS = os.environ['ANT_ARGS'] + +CLASSPATH = "" +if os.environ.has_key('CLASSPATH'): + CLASSPATH = os.environ['CLASSPATH'] + +# Builds the commandline +cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \ + 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \ + % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \ + CLASSPATH, string.join(sys.argv[1:], ' ')) + +if debug: + print '\n%s\n\n' % (cmdline) +sys.stdout.flush() + +# Run the biniou! +os.system(cmdline) Property changes on: trunk/tools/ant/bin/runant.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/ant/bin/runrc.cmd =================================================================== --- trunk/tools/ant/bin/runrc.cmd (rev 0) +++ trunk/tools/ant/bin/runrc.cmd 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,60 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Run RC file, name is in the first arg, second arg is either PATH + ENV or -r or nothing +*/ + +parse arg name path rest + +if name = '' then do + say 'RC file name is missing' + exit 1 +end + +if rest \= '' then do + say 'Too many parameters' + exit 1 +end + +call runit name path +exit 0 + +runit: procedure +parse arg name path dir + +if path \= '' & path \= '-r' then do + dir = value(translate(path),,'OS2ENVIRONMENT') + if dir = '' then return + dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */ +end + +if dir = '' then dir = directory() + +if path = '-r' then do /* recursive call */ + subdir = filespec('path', dir) + if subdir \= '\' then do + subdir = left(subdir, length(subdir)-1) + call runit name path filespec('drive', dir) || subdir + end +end + +/* Look for the file and run it */ +if right(dir, 1) \= '\' then dir = dir || '\' +rcfile = stream(dir || name, 'c', 'query exists') +if rcfile \= '' then interpret 'call "' || rcfile || '"' + +return Added: trunk/tools/ant/etc/ant-bootstrap.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/etc/ant-bootstrap.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/etc/changelog.xsl =================================================================== --- trunk/tools/ant/etc/changelog.xsl (rev 0) +++ trunk/tools/ant/etc/changelog.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xsl:stylesheet + xmlns:xsl='http://www.w3.org/1999/XSL/Transform' + version='1.0'> + + + <xsl:param name="title"/> + <xsl:param name="module"/> + <xsl:param name="cvsweb"/> + + <xsl:output method="html" indent="yes" encoding="US-ASCII" + doctype-public="-//W3C//DTD HTML 4.01//EN" + doctype-system="http://www.w3.org/TR/html401/strict.dtd"/> + +  + <xsl:template match="*"> + <xsl:copy> + <xsl:copy-of select="attribute::*[. != '']"/> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + + <xsl:template match="changelog"> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <style type="text/css"> + body, p { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 80%; + color: #000000; + background-color: #ffffff; + } + tr, td { + font-family: Verdana, Arial, Helvetica, sans-serif; + background: #eeeee0; + } + td { + padding-left: 20px; + } + .dateAndAuthor { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + text-align: left; + background: #a6caf0; + padding-left: 3px; + } + a { + color: #000000; + } + pre { + font-weight: bold; + } + </style> + </head> + <body> + <h1> + <a name="top"><xsl:value-of select="$title"/></a> + </h1> + <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p> + <hr/> + <table border="0" width="100%" cellspacing="1"> + + <xsl:apply-templates select=".//entry"> + <xsl:sort select="date" data-type="text" order="descending"/> + <xsl:sort select="time" data-type="text" order="descending"/> + </xsl:apply-templates> + + </table> + + </body> + </html> + </xsl:template> + + <xsl:template match="entry"> + <tr> + <td class="dateAndAuthor"> + <xsl:value-of select="date"/><xsl:text> </xsl:text><xsl:value-of select="time"/><xsl:text> </xsl:text><xsl:value-of select="author"/> + </td> + </tr> + <tr> + <td> + <pre> +<xsl:apply-templates select="msg"/></pre> + <ul> + <xsl:apply-templates select="file"/> + </ul> + </td> + </tr> + </xsl:template> + + <xsl:template match="date"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="time"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="author"> + <i> + <a> + <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> + <xsl:value-of select="."/></a> + </i> + </xsl:template> + + <xsl:template match="file"> + <li> + <a> + <xsl:choose> + <xsl:when test="string-length(prevrevision) = 0 "> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/></xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a> + </li> + </xsl:template> + +  + <xsl:template match="msg"> + <xsl:apply-templates/> + </xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/etc/checkstyle/checkstyle-frames.xsl =================================================================== --- trunk/tools/ant/etc/checkstyle/checkstyle-frames.xsl (rev 0) +++ trunk/tools/ant/etc/checkstyle/checkstyle-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,299 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> + + + + <xsl:output method="html" indent="yes" encoding="US-ASCII"/> + <xsl:decimal-format decimal-separator="." grouping-separator="," /> + + <xsl:param name="output.dir" select="'.'"/> + <xsl:param name="basedir" select="'.'"/> + + <xsl:template match="checkstyle"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="overview"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select="file[count(error) != 0]"/> + </xsl:template> + + <xsl:template name="index.html"> + <html> + <head> + <title>CheckStyle Audit</title> + </head> + <frameset cols="20%,80%"> + <frame src="allclasses-frame.html" name="fileListFrame"/> + <frame src="overview-frame.html" name="fileFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. + If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </html> + </xsl:template> + + <xsl:template name="pageHeader"> + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="text-align:right"><h2>CheckStyle Audit</h2></td> + </tr> + <tr> + <td class="text-align:right">Designed for use with + <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and + <a href='http://ant.apache.org/'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> + </xsl:template> + + <xsl:template match="checkstyle" mode="overview"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> +  + <xsl:call-template name="pageHeader"/> + +  + <xsl:apply-templates select="." mode="summary"/> + <hr size="1" width="100%" align="left"/> + +  + <xsl:apply-templates select="." mode="filelist"/> + </body> + </html> + </xsl:template> + + <xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .oddrow td { + background: #efefef; + } + .evenrow td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + </xsl:template> + +  + <xsl:template match="checkstyle" mode="all.classes"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <h2>Files</h2> + <p> + <table width="100%"> +  + <xsl:apply-templates select="file[count(error) != 0]" mode="all.classes"> + <xsl:sort select="substring-after(@name, $basedir)"/> + </xsl:apply-templates> + </table> + </p> + </body> + </html> + </xsl:template> + + <xsl:template match="checkstyle" mode="filelist"> + <h3>Files</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Name</th> + <th>Errors</th> + </tr> + <xsl:apply-templates select="file[count(error) != 0]" mode="filelist"> + <xsl:sort select="count(error)" order="descending" data-type="number"/> + </xsl:apply-templates> + </table> + </xsl:template> + + <xsl:template match="file" mode="filelist"> + <tr> + <xsl:call-template name="alternated-row"/> + <td nowrap="nowrap"> + <a> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + <td><xsl:value-of select="count(error)"/></td> + </tr> + </xsl:template> + + <xsl:template match="file" mode="all.classes"> + <tr> + <td nowrap="nowrap"> + <a target="fileFrame"> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + </tr> + </xsl:template> + +  + <xsl:template name="path"> + <xsl:param name="path"/> + +  + <xsl:variable name="path2" select="translate($path,'\','/')"/> + + + <xsl:if test="contains($path2,'/')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path2,'/')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path2,'/')) and not($path2 = '')"> + <xsl:text>../</xsl:text> + </xsl:if> + </xsl:template> + + <xsl:template match="file"> + <redirect:write file="{$output.dir}/files/{substring-after(@name, $basedir)}.html"> + <html> + <head> + <link rel="stylesheet" type="text/css"> + <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="substring-after(@name, $basedir)"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute> + </link> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>File <xsl:value-of select="substring-after(@name, $basedir)"/></h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Error Description</th> + <th>Line:Column</th> + </tr> + <xsl:for-each select="error"> + <tr> + <xsl:call-template name="alternated-row"/> + <td><a title="{@source}"><xsl:value-of select="@message"/></a></td> + <td align="center"><xsl:value-of select="@line"/><xsl:if test="@column">:<xsl:value-of select="@column"/></xsl:if></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> + </redirect:write> + </xsl:template> + + <xsl:template match="checkstyle" mode="summary"> + <h3>Summary</h3> + <xsl:variable name="fileCount" select="count(file)"/> + <xsl:variable name="errorCount" select="count(file/error)"/> + <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Total Files</th> + <th>Files With Errors</th> + <th>Errors</th> + </tr> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="$fileCount"/></td> + <td><xsl:value-of select="$fileErrorCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + </tr> + </table> + </xsl:template> + + <xsl:template name="alternated-row"> + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">oddrow</xsl:if> + <xsl:if test="position() mod 2 = 0">evenrow</xsl:if> + </xsl:attribute> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file Added: trunk/tools/ant/etc/checkstyle/checkstyle-text.xsl =================================================================== --- trunk/tools/ant/etc/checkstyle/checkstyle-text.xsl (rev 0) +++ trunk/tools/ant/etc/checkstyle/checkstyle-text.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + + + <xsl:strip-space elements="checkstyle"/> + <xsl:preserve-space elements="file"/> + <xsl:output method="text"/> + <xsl:template match="checkstyle/file/error"> + <xsl:value-of select="../@name"/> + <xsl:text>:</xsl:text> + <xsl:value-of select="@line"/> + <xsl:text>:</xsl:text> + <xsl:value-of select="@column"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@message"/> + </xsl:template> +</xsl:stylesheet> + Added: trunk/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl =================================================================== --- trunk/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl (rev 0) +++ trunk/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,130 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> + + + + <xsl:output method="xml" indent="yes"/> + <xsl:decimal-format decimal-separator="." grouping-separator="," /> + + <xsl:param name="output.dir" select="'.'"/> + <xsl:param name="basedir" select="'.'"/> + + <xsl:template match="checkstyle"> + <document> + <properties> + <title>Checkstyle Audit</title> + </properties> + + <body> + <xsl:apply-templates select="." mode="summary"/> +  + <xsl:apply-templates select="." mode="filelist"/> + <xsl:apply-templates select="file[count(error) != 0]"/> + </body> + </document> + </xsl:template> + + <xsl:template match="checkstyle" mode="filelist"> + <section name="Files"> + <table> + <tr> + <th>Name</th> + <th>Errors</th> + </tr> + <xsl:apply-templates select="file[count(error) != 0]" mode="filelist"> + <xsl:sort select="count(error)" order="descending" data-type="number"/> + </xsl:apply-templates> + </table> + </section> + </xsl:template> + + <xsl:template match="file" mode="filelist"> + <tr> + <xsl:call-template name="alternated-row"/> + <td nowrap="nowrap"> + <a> + <xsl:attribute name="href"> + <xsl:text>files</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + <td><xsl:value-of select="count(error)"/></td> + </tr> + </xsl:template> + + <xsl:template match="file"> + <redirect:write file="{$output.dir}/files{substring-after(@name, $basedir)}.xml"> + <document> + <properties> + <title>Checkstyle Audit</title> + </properties> + + <body> + <section name="Details for {substring-after(@name, $basedir)}"> + <table> + <tr> + <th>Error Description</th> + <th>Line</th> + </tr> + <xsl:for-each select="error"> + <tr> + <xsl:call-template name="alternated-row"/> + <td><a title="{@source}"><xsl:value-of select="@message"/></a></td> + <td><xsl:value-of select="@line"/></td> + </tr> + </xsl:for-each> + </table> + </section> + </body> + </document> + </redirect:write> + </xsl:template> + + <xsl:template match="checkstyle" mode="summary"> + <section name="Summary"> + <xsl:variable name="fileCount" select="count(file)"/> + <xsl:variable name="errorCount" select="count(file/error)"/> + <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/> + <table> + <tr> + <th>Files</th> + <th>Files With Errors</th> + <th>Errors</th> + </tr> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="$fileCount"/></td> + <td><xsl:value-of select="$fileErrorCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + </tr> + </table> + </section> + </xsl:template> + + <xsl:template name="alternated-row"> + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">oddrow</xsl:if> + <xsl:if test="position() mod 2 = 0">evenrow</xsl:if> + </xsl:attribute> + </xsl:template> +</xsl:stylesheet> + Added: trunk/tools/ant/etc/coverage-frames.xsl =================================================================== --- trunk/tools/ant/etc/coverage-frames.xsl (rev 0) +++ trunk/tools/ant/etc/coverage-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,489 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="/snapshot"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select="./package" mode="write"/> +</xsl:template> + + +<xsl:template name="index.html"> +<html> + <head><title>Coverage Results.</title></head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> +</html> +</xsl:template> + + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } +</xsl:template> + + +<xsl:template match="snapshot" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="package/class"> + <xsl:sort select="@name"/> + <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/> + <xsl:variable name="link"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:variable> + <tr> + <td nowrap="nowrap"> + <a target="classFrame" href="{$link}"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template match="snapshot" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:for-each select="package"> + <xsl:sort select="@name" order="ascending"/> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template match="snapshot" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <tr> +  + <th width="10%" nowrap="nowrap">Reported Classes</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> + <tr class="a"> +  + <td><xsl:value-of select="count(package/class)"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + To ensure accurate test runs on Java applications, developers need to know how much of + the code has been tested, and where to find any untested code. Coverage helps you + locate untested code, and measure precisely how much code has been exercised. + The result is a higher quality application in a shorter period of time. + <p/> + </td> + </tr> + </table> + + <h3>Packages</h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="package[1]" mode="stats.header"/> +  + <xsl:for-each select="package"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{translate(@name,'.','/')}/package-summary.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> + </xsl:for-each> + </table> + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + + +<xsl:template match="package" mode="write"> + <xsl:variable name="package.dir"> + <xsl:if test="not(@name = '')"><xsl:value-of select="translate(@name,'.','/')"/></xsl:if> + <xsl:if test="@name = ''">.</xsl:if> + </xsl:variable> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:apply-templates select="." mode="classes.list"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:apply-templates select="." mode="package.summary"/> + </redirect:write> + +  + <xsl:for-each select="class"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + + +<xsl:template match="package" mode="classes.list"> + <html> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2> + </td> + </tr> + </table> + + <H2>Classes</H2> + <TABLE WIDTH="100%"> + <xsl:for-each select="class"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </TABLE> + </BODY> + </html> +</xsl:template> + + +<xsl:template match="package" mode="package.summary"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> +  + <BODY onload="open('package-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="@name"/></h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="." mode="stats"/> + </table> + + <xsl:if test="count(class) > 0"> + <H3>Classes</H3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="class" mode="stats"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + </xsl:apply-templates> + </table> + </xsl:if> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + +<xsl:template match="class" mode="class.details"> + <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + +  + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="." mode="stats"/> + </table> + +  + <H3>Methods</H3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="method[1]" mode="stats.header"/> + <xsl:apply-templates select="method" mode="stats"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + </xsl:apply-templates> + </table> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> + +</xsl:template> + + +<xsl:template name="pageHeader"> +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Coverage</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.sitraka.com/jprobe'>Sitraka JProbe</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + +<xsl:template name="table.header"> + <tr> + <th width="80%">Name</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> + +<xsl:template match="method" mode="stats.header"> + <tr> + <th width="90%">Name</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> +<xsl:template match="method" mode="stats"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@name"/></td> + <td> + <xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/> + </td> + </tr> +</xsl:template> + +<xsl:template match="package|class" mode="stats.header"> + <tr> + <th width="80%">Name</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> +<xsl:template match="package|class" mode="stats"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> +</xsl:template> + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + +</xsl:stylesheet> + + Added: trunk/tools/ant/etc/jdepend-frames.xsl =================================================================== --- trunk/tools/ant/etc/jdepend-frames.xsl (rev 0) +++ trunk/tools/ant/etc/jdepend-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,487 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + + +<xsl:param name="output.dir" select="'.'"/> + +<xsl:template match="JDepend"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-packages.html"> + <xsl:apply-templates select="." mode="packages.details"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-cycles.html"> + <xsl:apply-templates select="." mode="cycles.details"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-explanations.html"> + <xsl:apply-templates select="." mode="explanations"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-packages.html"> + <xsl:apply-templates select="Packages" mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-cycles.html"> + <xsl:apply-templates select="Cycles" mode="all.cycles"/> + </redirect:write> +</xsl:template> + + +<xsl:template name="index.html"> +<html> + <head> + <title>JDepend Analysis</title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="all-packages.html" name="packageListFrame"/> + <frame src="all-cycles.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + margin-left:2em; + margin-right:2em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> +</xsl:template> + +<xsl:template match="JDepend" mode="overview.packages"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Summary</h2><td> + </td><td align="right"> + [summary] + [<a href="overview-packages.html">packages</a>] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + <table width="100%" class="details"> + <tr> + <th>Package</th> + <th>Total Classes</th> + <th><a href="overview-explanations.html#EXnumber">Abstract Classes</a></th> + <th><a href="overview-explanations.html#EXnumber">Concrete Classes</a></th> + <th><a href="overview-explanations.html#EXafferent">Afferent Couplings</a></th> + <th><a href="overview-explanations.html#EXefferent">Efferent Couplings</a></th> + <th><a href="overview-explanations.html#EXabstractness">Abstractness</a></th> + <th><a href="overview-explanations.html#EXinstability">Instability</a></th> + <th><a href="overview-explanations.html#EXdistance">Distance</a></th> + + </tr> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <tr> + <td align="left"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td> + <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td> + <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td> + <td align="right"><xsl:value-of select="Stats/Ca"/></td> + <td align="right"><xsl:value-of select="Stats/Ce"/></td> + <td align="right"><xsl:value-of select="Stats/A"/></td> + <td align="right"><xsl:value-of select="Stats/I"/></td> + <td align="right"><xsl:value-of select="Stats/D"/></td> + </tr> + </xsl:if> + </xsl:for-each> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) > 0"> + <tr> + <td align="left"> + <xsl:value-of select="@name"/> + </td> + <td align="left" colspan="8"><xsl:value-of select="error"/></td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="packages.details"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Packages</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [packages] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute> + <xsl:value-of select="@name"/></a></h3> + + <table width="100%"><tr> + <td><a href="overview-explanations.html#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td> + <td><a href="overview-explanations.html#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td> + <td><a href="overview-explanations.html#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td> + <td><a href="overview-explanations.html#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td> + <td><a href="overview-explanations.html#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td> + </tr></table> + + <table width="100%" class="details"> + <tr> + <th>Abstract Classes</th> + <th>Concrete Classes</th> + <th>Used by Packages</th> + <th>Uses Packages</th> + </tr> + <tr> + <td valign="top" width="25%"> + <xsl:if test="count(AbstractClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="AbstractClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(ConcreteClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="ConcreteClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(UsedBy/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="UsedBy/Package"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(DependsUpon/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="DependsUpon/Package"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + </tr> + </table> + </xsl:if> + </xsl:for-each> +  + <table width="100%"><tr align="left"><td></td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [packages] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="cycles.details"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Cycles</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [cycles] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> +  + + <xsl:if test="count(Cycles/Package) = 0"> + <p>There are no cyclic dependancies.</p> + </xsl:if> + <xsl:for-each select="Cycles/Package"> + <h3><a><xsl:attribute name="name">#CY<xsl:value-of select="@Name"/></xsl:attribute><xsl:value-of select="@Name"/></a></h3><p> + <xsl:for-each select="Package"> + <xsl:value-of select="."/><br/> + </xsl:for-each></p> + </xsl:for-each> +  + <table width="100%"><tr align="left"><td></td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [cycles] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="explanations"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + + <table width="100%"><tr align="left"><h2>Explanations</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [<a href="overview-cycles.html">cycles</a>] + [explanations] + </td></tr></table> + + <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p> + + <h3><a name="EXnumber">Number of Classes</a></h3> + <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p> + <h3><a name="EXafferent">Afferent Couplings</a></h3> + <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p> + <h3><a name="EXefferent">Efferent Couplings</a></h3> + <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p> + <h3><a name="EXabstractness">Abstractness</a></h3> + <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p> + <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p> + <h3><a name="EXinstability">Instability</a></h3> + <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p> + <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p> + <h3><a name="EXdistance">Distance</a></h3> + <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p> + <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p> + <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p> + + </body> + </html> +</xsl:template> + + + +<xsl:template match="JDepend/Packages" mode="all.packages"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right"> + [<a href="overview-summary.html" target="classFrame">summary</a>] + [<a href="overview-packages.html" target="classFrame">packages</a>] + [<a href="overview-cycles.html" target="classFrame">cycles</a>] + [<a href="overview-explanations.html" target="classFrame">explanations</a>] + </td></tr></table> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="Package[count(error)=0]" mode="all.packages.link"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + <xsl:apply-templates select="Package[count(error) > 0]" mode="all.packages.nolink"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend/Packages/Package" mode="all.packages.link"> + <tr> + <td nowrap="nowrap"> + <a href="overview-packages.html#PK{@name}" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="JDepend/Packages/Package" mode="all.packages.nolink"> + <tr> + <td nowrap="nowrap"> + Not Analyzed: <xsl:value-of select="@name"/> + </td> + </tr> +</xsl:template> + + +<xsl:template match="JDepend/Cycles" mode="all.cycles"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right"> + [<a href="overview-summary.html" target="classFrame">summary</a>] + [<a href="overview-packages.html" target="classFrame">packages</a>] + [<a href="overview-cycles.html" target="classFrame">cycles</a>] + [<a href="overview-explanations.html" target="classFrame">explanations</a>] + </td></tr></table> + <h2>Cycles</h2> + <table width="100%"> + <xsl:apply-templates select="Package" mode="all.cycles"> + <xsl:sort select="@Name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend/Cycles/Package" mode="all.cycles"> + <tr> + <td nowrap="nowrap"> + <a href="overview-cycles.html#CY{@Name}" target="classFrame"><xsl:value-of select="@Name"/></a> + </td> + </tr> +</xsl:template> + + +<xsl:template name="pageHeader"> + <h1>JDepend Analysis</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/etc/jdepend.xsl =================================================================== --- trunk/tools/ant/etc/jdepend.xsl (rev 0) +++ trunk/tools/ant/etc/jdepend.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,276 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + + +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + +<xsl:template match="JDepend"> + <html> + <head> + <title>JDepend Analysis</title> + + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + margin-left:2em; + margin-right:2em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> + + + </head> + <body> +  + + <h1><a name="top">JDepend Analysis</a></h1> + <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p> + <hr size="2" /> + + <table width="100%"><tr><td> + <a name="NVsummary"><h2>Summary</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <table width="100%" class="details"> + <tr> + <th>Package</th> + <th>Total Classes</th> + <th><a href="#EXnumber">Abstract Classes</a></th> + <th><a href="#EXnumber">Concrete Classes</a></th> + <th><a href="#EXafferent">Afferent Couplings</a></th> + <th><a href="#EXefferent">Efferent Couplings</a></th> + <th><a href="#EXabstractness">Abstractness</a></th> + <th><a href="#EXinstability">Instability</a></th> + <th><a href="#EXdistance">Distance</a></th> + + </tr> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <tr> + <td align="left"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td> + <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td> + <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td> + <td align="right"><xsl:value-of select="Stats/Ca"/></td> + <td align="right"><xsl:value-of select="Stats/Ce"/></td> + <td align="right"><xsl:value-of select="Stats/A"/></td> + <td align="right"><xsl:value-of select="Stats/I"/></td> + <td align="right"><xsl:value-of select="Stats/D"/></td> + + + </tr> + </xsl:if> + </xsl:for-each> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) > 0"> + <tr> + <td align="left"> + <xsl:value-of select="@name"/> + </td> + <td align="left" colspan="8"><xsl:value-of select="error"/></td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + + <table width="100%"><tr><td> + <a name="NVpackages"><h2>Packages</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute> + <xsl:value-of select="@name"/></a></h3> + + <table width="100%"><tr> + <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td> + <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td> + <td><a href="#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td> + <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td> + <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td> + </tr></table> + + <table width="100%" class="details"> + <tr> + <th>Abstract Classes</th> + <th>Concrete Classes</th> + <th>Used by Packages</th> + <th>Uses Packages</th> + </tr> + <tr> + <td valign="top" width="25%"> + <xsl:if test="count(AbstractClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="AbstractClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(ConcreteClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="ConcreteClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(UsedBy/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="UsedBy/Package"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(DependsUpon/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="DependsUpon/Package"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + </tr> + </table> + </xsl:if> + </xsl:for-each> + + <table width="100%"><tr><td> + <a name="NVcycles"><h2>Cycles</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <xsl:if test="count(Cycles/Package) = 0"> + <p>There are no cyclic dependancies.</p> + </xsl:if> + <xsl:for-each select="Cycles/Package"> + <h3><xsl:value-of select="@Name"/></h3><p> + <xsl:for-each select="Package"> + <xsl:value-of select="."/><br/> + </xsl:for-each></p> + </xsl:for-each> + + <table width="100%"><tr><td> + <a name="NVexplanations"><h2>Explanations</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p> + + <h3><a name="EXnumber">Number of Classes</a></h3> + <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p> + <h3><a name="EXafferent">Afferent Couplings</a></h3> + <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p> + <h3><a name="EXefferent">Efferent Couplings</a></h3> + <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p> + <h3><a name="EXabstractness">Abstractness</a></h3> + <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p> + <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p> + <h3><a name="EXinstability">Instability</a></h3> + <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p> + <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p> + <h3><a name="EXdistance">Distance</a></h3> + <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p> + <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p> + <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p> + + </body> + </html> +</xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/etc/junit-frames-xalan1.xsl =================================================================== --- trunk/tools/ant/etc/junit-frames-xalan1.xsl (rev 0) +++ trunk/tools/ant/etc/junit-frames-xalan1.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,719 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="testsuites"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/testsuites/testsuite[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + <xsl:if test="string-length(./system-out)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}-out.txt"> + <xsl:value-of select="./system-out" /> + </redirect:write> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}-err.txt"> + <xsl:value-of select="./system-err" /> + </redirect:write> + </xsl:if> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<html> + <head> + <title>Unit Test Results.</title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </frameset> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> +body { + font:normal 68% verdana,arial,helvetica; + color:#000000; +} +table tr td, table tr th { + font-size: 68%; +} +table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; +} +table.details tr td{ + background:#eeeee0; +} + +p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; +} +h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica +} +h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica +} +h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica +} +h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +.Error { + font-weight:bold; color:red; +} +.Failure { + font-weight:bold; color:purple; +} +.Properties { + text-align:right; +} +</xsl:template> + + + +<xsl:template match="testsuite" mode="class.details"> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable> + <html> + <head> + <title>Unit Test Results: <xsl:value-of select="$class.name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:apply-templates select="properties"/> + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style type=\"text/css\">"); + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>Class <xsl:value-of select="$class.name"/></h3> + + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="." mode="print.test"/> + </table> + + <h2>Tests</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <xsl:if test="string-length(./system-out)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute> + System.out » + </a> + </div> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute> + System.err » + </a> + </div> + </xsl:if> + </body> + </html> +</xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <html> + <head> + <title>Unit Test Classes: <xsl:value-of select="$name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <h2><a href="package-summary.html" target="classFrame"> + <xsl:value-of select="$name"/> + <xsl:if test="$name = ''"><none></xsl:if> + </a></h2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="/testsuites/testsuite[./@package = $name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.classes"> + <html> + <head> + <title>All Unit Test Classes</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.packages"> + <html> + <head> + <title>All Unit Test Packages</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages"> + <xsl:sort select="@package"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="testsuites" mode="overview.packages"> + <html> + <head> + <title>Unit Test Results: Summary</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$errorCount > 0">Error</xsl:when> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated. + </td> + </tr> + </table> + + <h2>Packages</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package" order="ascending"/> +  + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when> + <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="./{translate(@package,'.','/')}/package-summary.html"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a></td> + <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> + <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> + <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="sum($insamepackage/@time)"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$insamepackage/@timestamp"/></td> + <td><xsl:value-of select="$insamepackage/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/> + <xsl:if test="count($insamepackage) > 0"> + <h2>Classes</h2> + <p> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="$insamepackage" mode="print.test"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </p> + </xsl:if> + </body> + </html> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link> +</xsl:template> + + + +<xsl:template name="pageHeader"> + <h1>Unit Test Results</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <tr valign="top"> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@tests"/></td> + <td><xsl:apply-templates select="@errors"/></td> + <td><xsl:apply-templates select="@failures"/></td> + <td><xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="error">Error</xsl:when> + <xsl:when test="failure">Failure</xsl:when> + <xsl:otherwise>TableRowColor</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="@name"/></td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <br/><br/> + <code> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:param name="br"><br/></xsl:param> + <xsl:value-of select='stringutils:replace(string($word),"
",$br)'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> +</xsl:stylesheet> Added: trunk/tools/ant/etc/junit-frames.xsl =================================================================== --- trunk/tools/ant/etc/junit-frames.xsl (rev 0) +++ trunk/tools/ant/etc/junit-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,877 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="http://xml.apache.org/xalan/redirect" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> + + + +<xsl:param name="output.dir" select="'.'"/> +<xsl:param name="TITLE">Unit Test Results.</xsl:param> + + +<xsl:template match="testsuites"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-tests.html"> + <xsl:apply-templates select="." mode="all.tests"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/alltests-fails.html"> + <xsl:apply-templates select="." mode="all.tests"> + <xsl:with-param name="type" select="'fails'"/> + </xsl:apply-templates> + </redirect:write> + +  + <redirect:write file="{$output.dir}/alltests-errors.html"> + <xsl:apply-templates select="." mode="all.tests"> + <xsl:with-param name="type" select="'errors'"/> + </xsl:apply-templates> + </redirect:write> + +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/testsuites/testsuite[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + <xsl:if test="string-length(./system-out)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-out.txt"> + <xsl:value-of disable-output-escaping="yes" select="./system-out"/> + </redirect:write> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-err.txt"> + <xsl:value-of disable-output-escaping="yes" select="./system-err"/> + </redirect:write> + </xsl:if> + <xsl:if test="@failures != 0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-fails.html"> + <xsl:apply-templates select="." mode="class.details"> + <xsl:with-param name="type" select="'fails'"/> + </xsl:apply-templates> + </redirect:write> + </xsl:if> + <xsl:if test="@errors != 0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-errors.html"> + <xsl:apply-templates select="." mode="class.details"> + <xsl:with-param name="type" select="'errors'"/> + </xsl:apply-templates> + </redirect:write> + </xsl:if> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<html> + <head> + <title><xsl:value-of select="$TITLE"/></title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </frameset> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> +body { + font:normal 68% verdana,arial,helvetica; + color:#000000; +} +table tr td, table tr th { + font-size: 68%; +} +table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; +} +table.details tr td{ + background:#eeeee0; +} + +p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; +} +h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica +} +h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica +} +h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica +} +h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +.Error { + font-weight:bold; color:red; +} +.Failure { + font-weight:bold; color:purple; +} +.Properties { + text-align:right; +} +</xsl:template> + + +<xsl:template match="testsuites" mode="all.tests"> + <xsl:param name="type" select="'all'"/> + <html> + <xsl:variable name="title"> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:text>All Failures</xsl:text> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:text>All Errors</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>All Tests</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <head> + <title>Unit Test Results: <xsl:value-of select="$title"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2><xsl:value-of select="$title"/></h2> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:call-template> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"> + <xsl:apply-templates select="./error"/> + </td> + </tr> + </xsl:if> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:apply-templates select=".//testcase[failure]" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:apply-templates select=".//testcase[error]" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select=".//testcase" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuite" mode="class.details"> + <xsl:param name="type" select="'all'"/> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable> + <html> + <head> + <title>Unit Test Results: <xsl:value-of select="$class.name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:apply-templates select="properties"/> + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style type=\"text/css\">"); + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>Class <xsl:value-of select="$class.name"/></h3> + + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="." mode="print.test"/> + </table> + + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <h2>Failures</h2> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <h2>Errors</h2> + </xsl:when> + <xsl:otherwise> + <h2>Tests</h2> + </xsl:otherwise> + </xsl:choose> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:apply-templates select="./testcase[failure]" mode="print.test"/> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:apply-templates select="./testcase[error]" mode="print.test"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </xsl:otherwise> + </xsl:choose> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <xsl:if test="string-length(./system-out)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute> + System.out » + </a> + </div> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute> + System.err » + </a> + </div> + </xsl:if> + </body> + </html> +</xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <html> + <head> + <title>Unit Test Classes: <xsl:value-of select="$name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <h2><a href="package-summary.html" target="classFrame"> + <xsl:value-of select="$name"/> + <xsl:if test="$name = ''"><none></xsl:if> + </a></h2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="/testsuites/testsuite[./@package = $name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{@id}_{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.classes"> + <html> + <head> + <title>All Unit Test Classes</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.packages"> + <html> + <head> + <title>All Unit Test Packages</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages"> + <xsl:sort select="@package"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="testsuites" mode="overview.packages"> + <html> + <head> + <title>Unit Test Results: Summary</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$errorCount > 0">Error</xsl:when> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td> + <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td> + <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated. + </td> + </tr> + </table> + + <h2>Packages</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package" order="ascending"/> +  + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when> + <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="./{translate(@package,'.','/')}/package-summary.html"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a></td> + <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> + <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> + <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="sum($insamepackage/@time)"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$insamepackage/@timestamp"/></td> + <td><xsl:value-of select="$insamepackage/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/> + <xsl:if test="count($insamepackage) > 0"> + <h2>Classes</h2> + <p> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="$insamepackage" mode="print.test"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </p> + </xsl:if> + </body> + </html> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link> +</xsl:template> + + + +<xsl:template name="pageHeader"> + <h1><xsl:value-of select="$TITLE"/></h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <xsl:param name="show.class" select="''"/> + <tr valign="top"> + <xsl:if test="boolean($show.class)"> + <th>Class</th> + </xsl:if> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a title="Display all tests" href="{@id}_{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><a title="Display all tests" href="{@id}_{(a)name}.html"><xsl:apply-templates select="@tests"/></a></td> + <td> + <xsl:choose> + <xsl:when test="@errors != 0"> + <a title="Display only errors" href="{@id}_{(a)name}-errors.html"><xsl:apply-templates select="@errors"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="@errors"/> + </xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="@failures != 0"> + <a title="Display only failures" href="{@id}_{(a)name}-fails.html"><xsl:apply-templates select="@failures"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="@failures"/> + </xsl:otherwise> + </xsl:choose> + </td> + <td><xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <xsl:param name="show.class" select="''"/> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="error">Error</xsl:when> + <xsl:when test="failure">Failure</xsl:when> + <xsl:otherwise>TableRowColor</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:variable name="class.href"> + <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/> + </xsl:variable> + <xsl:if test="boolean($show.class)"> + <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td> + </xsl:if> + <td> + <a name="{@name}"/> + <xsl:choose> + <xsl:when test="boolean($show.class)"> + <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@name"/> + </xsl:otherwise> + </xsl:choose> + </td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <br/><br/> + <code> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> +</xsl:stylesheet> Added: trunk/tools/ant/etc/junit-noframes.xsl =================================================================== --- trunk/tools/ant/etc/junit-noframes.xsl (rev 0) +++ trunk/tools/ant/etc/junit-noframes.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,467 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"> +<xsl:output method="html" indent="yes" encoding="US-ASCII" + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + +<xsl:param name="TITLE">Unit Test Results.</xsl:param> + + +<xsl:template match="testsuites"> + <html> + <head> + <title><xsl:value-of select="$TITLE"/></title> + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, table tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:for-each select="./testsuite"> + <xsl:apply-templates select="properties"/> + </xsl:for-each> + + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style>") + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <a name="top"></a> + <xsl:call-template name="pageHeader"/> + +  + <xsl:call-template name="summary"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="packagelist"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="packages"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="classes"/> + + </body> + </html> +</xsl:template> + + + +  +  +  +  + <xsl:template name="packagelist"> + <h2>Packages</h2> + Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package"/> + <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/> + <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/> + <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/> + <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/> + <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/> + +  + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:when test="$errorCount > 0">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td> + <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </xsl:template> + + +  +  +  +  +  + <xsl:template name="packages"> +  + <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package"/> + <a name="{@package}"></a> + <h3>Package <xsl:value-of select="@package"/></h3> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + +  + <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/> + </table> + <a href="#top">Back to top</a> + <p/> + <p/> + </xsl:for-each> + </xsl:template> + + <xsl:template name="classes"> + <xsl:for-each select="testsuite"> + <xsl:sort select="@name"/> +  + <a name="{@name}"></a> + <h3>TestCase <xsl:value-of select="@name"/></h3> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <p/> + + <a href="#top">Back to top</a> + </xsl:for-each> + </xsl:template> + + <xsl:template name="summary"> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:when test="$errorCount > 0">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated. + </td> + </tr> + </table> + </xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + +<xsl:template name="pageHeader"> + <h1><xsl:value-of select="$TITLE"/></h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + +<xsl:template match="testsuite" mode="header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <tr valign="top"> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + +  + <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td> + <td><xsl:value-of select="@tests"/></td> + <td><xsl:value-of select="@errors"/></td> + <td><xsl:value-of select="@failures"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="failure | error">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="@name"/></td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <code> + <br/><br/> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/etc/log.xsl =================================================================== --- trunk/tools/ant/etc/log.xsl (rev 0) +++ trunk/tools/ant/etc/log.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,203 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + + + +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + +<xsl:template match="/"> +<html> + <head> + <style type="text/css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin: 0; + font:normal 100% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + table.status { + font:bold 80% arial,helvetica,sanserif; + background-color:#525D76; + color:#ffffff; + } + table.log tr td, tr th { + font-size: 80%; + } + .error { + color:red; + } + .warn { + color:brown; + } + .info { + color:gray; + } + .debug{ + color:gray; + } + .failed { + font-size:80%; + background-color: red; + color:#FFFFFF; + font-weight: bold + } + .complete { + font-size:80%; + background-color: #525D76; + color:#FFFFFF; + font-weight: bold + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + background: #ccc; + color: black; + } + table, th, td { + border: none + } + h3 { + font:bold 80% arial,helvetica,sanserif; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + </style> + </head> + <body> +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td valign="top" class="bannercell"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right;vertical-align:bottom"> + <a href="http://ant.apache.org/">Apache Ant</a> + </td> + </tr> + </table> + + <table border="0" width="100%"> + <tr><td><hr noshade="yes" size="1"/></td></tr> + </table> + + <xsl:apply-templates select="build"/> + + </body> +</html> +</xsl:template> + +<xsl:template match="build"> +  + <table width="100%"> + <xsl:attribute name="class"> + <xsl:if test="@error">failed</xsl:if> + <xsl:if test="not(@error)">complete</xsl:if> + </xsl:attribute> + <tr> + <xsl:if test="@error"> + <td nowrap="yes">Build Failed</td> + </xsl:if> + <xsl:if test="not(@error)"> + <td nowrap="yes">Build Complete</td> + </xsl:if> + <td style="text-align:right" nowrap="yes">Total Time: <xsl:value-of select="@time"/></td> + </tr> + <tr> + <td colspan="2"> + <xsl:if test="@error"> + <tt><xsl:value-of select="@error"/></tt><br/> + <i style="font-size:80%">See the <a href="#stacktrace" alt="Click for details">stacktrace</a>.</i> + </xsl:if> + </td> + </tr> + </table> + <table border="1" cellspacing="2" cellpadding="3" width="100%" style="font-size:80%"> + <tr class="a"><td width="1">ant.file</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.file')], '->')"/></td></tr> + <tr class="b"><td width="1">ant.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.version')], '->')"/></td></tr> + <tr class="a"><td width="1">java.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'java.vm.version')], '->')"/></td></tr> + <tr class="b"><td width="1">os.name</td><td><xsl:value-of select="substring-after(//message[contains(text(),'os.name')], '->')"/></td></tr> + </table> +  + <h3>Build events</h3> + <table class="log" border="1" cellspacing="2" cellpadding="3" width="100%"> + <tr> + <th nowrap="yes" align="left" width="1%">target</th> + <th nowrap="yes" align="left" width="1%">task</th> + <th nowrap="yes" align="left">message</th> + </tr> + <xsl:apply-templates select=".//message[@priority != 'debug']"/> + </table> + <p> +  + <xsl:if test="stacktrace"> + <a name="stacktrace"/> + <h3>Error details</h3> + <table width="100%"> + <tr><td> + <pre><xsl:value-of select="stacktrace"/></pre> + </td></tr> + </table> + </xsl:if> + </p> +</xsl:template> + + +<xsl:template match="message[@priority!='debug']"> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> + </xsl:attribute> + <td nowrap="yes" width="1%"><xsl:value-of select="../../@name"/></td> + <td nowrap="yes" style="text-align:right" width="1%">[ <xsl:value-of select="../@name"/> ]</td> + <td class="{@priority}" nowrap="yes"> + <xsl:value-of select="text()"/> + </td> + </tr> +</xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/etc/maudit-frames.xsl =================================================================== --- trunk/tools/ant/etc/maudit-frames.xsl (rev 0) +++ trunk/tools/ant/etc/maudit-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,503 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="classes"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:for-each select="./class[not(./@package = preceding-sibling::class/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/classes/class[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<HTML> + <HEAD><TITLE>Audit Results.</TITLE></HEAD> + <FRAMESET cols="20%,80%"> + <FRAMESET rows="30%,70%"> + <FRAME src="overview-frame.html" name="packageListFrame"/> + <FRAME src="allclasses-frame.html" name="classListFrame"/> + </FRAMESET> + <FRAME src="overview-summary.html" name="classFrame"/> + </FRAMESET> + <noframes> + <H2>Frame Alert</H2> + <P> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </P> + </noframes> +</HTML> +</xsl:template> + + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } +</xsl:template> + + + +<xsl:template match="class" mode="class.details"> + <xsl:variable name="package.name" select="@package"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:apply-templates select="." mode="print.audit"/> + </table> + + <H3>Violations</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="violation.audit.header"/> + <xsl:apply-templates select="./violation" mode="print.audit"> + <xsl:sort data-type="number" select="@line"/> + </xsl:apply-templates> + </table> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></H2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <TABLE WIDTH="100%"> + <xsl:apply-templates select="/classes/class[./@package = $name]" mode="classes.list"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </TABLE> + </BODY> + </HTML> +</xsl:template> + +<xsl:template match="class" mode="classes.list"> + <tr> + <td nowrap="nowrap"> +  + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="classes" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select=".//class" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.classes"> +  + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="classes" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="class[not(./@package = preceding-sibling::class/@package)]" mode="all.packages"> + <xsl:sort select="@package" order="ascending"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="classes" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Audited classes</th> + <th>Reported classes</th> + <th>Violations</th> + </tr> + <tr class="a"> + <td><xsl:value-of select="@audited"/></td> + <td><xsl:value-of select="@reported"/></td> + <td><xsl:value-of select="@violations"/></td> + </tr> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Rules checked have originated from style guidelines suggested by the language designers, + experience from the Java development community and insite experience. Violations are generally + reported with a reference to the <a href="http://java.sun.com/docs/books/jls/second_edition/html/jTOC.doc.html">Java Language Specifications</a> (JLS x.x.x) + and Metamata Audit rules (x.x). + Please consult these documents for additional information about violations. + <p/> + Rules checked also enforce adherence to <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun Java coding guidelines</a> in use at Jakarta. + <p/> + One should note that these violations do not necessary underline errors but should be used + as an indication for <i>possible</i> errors. As always, use your best judgment and review + them carefully, it might save you hours of debugging. + </td> + </tr> + </table> + + <h3>Packages</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:for-each select="class[not(./@package = preceding-sibling::class/@package)]"> + <xsl:sort select="@package" order="ascending"/> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td> + <td><xsl:value-of select="sum(/classes/class[./@package = current()/@package]/@violations)"/></td> + </tr> + </xsl:for-each> + </table> + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:if test="count(/classes/class[./@package = $name]) > 0"> + <H3>Classes</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:apply-templates select="/classes/class[./@package = $name]" mode="print.audit"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </xsl:if> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + +<xsl:template name="pageHeader"> + +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Audit</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Audit</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + + +<xsl:template name="class.audit.header"> + <tr> + <th width="80%">Name</th> + <th>Violations</th> + </tr> +</xsl:template> + + +<xsl:template name="violation.audit.header"> + <tr> + <th>Line</th> + <th>Message</th> + </tr> +</xsl:template> + + + +<xsl:template match="class" mode="print.audit"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@violations"/></td> + </tr> +</xsl:template> + +<xsl:template match="violation" mode="print.audit"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@line"/></td> + <td><xsl:apply-templates select="@message"/></td> + </tr> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + +</xsl:stylesheet> + Added: trunk/tools/ant/etc/mmetrics-frames.xsl =================================================================== --- trunk/tools/ant/etc/mmetrics-frames.xsl (rev 0) +++ trunk/tools/ant/etc/mmetrics-frames.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,1026 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:xalan="http://xml.apache.org/xalan" + xmlns:redirect="org.apache.xalan.lib.Redirect" + exclude-result-prefixes="xalan" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:param name="vg.max" select="10"/> +<xsl:param name="loc.max" select="1000"/> +<xsl:param name="dit.max" select="10"/> +<xsl:param name="noa.max" select="250"/> +<xsl:param name="nrm.max" select="50"/> +<xsl:param name="nlm.max" select="250"/> +<xsl:param name="wmc.max" select="250"/> +<xsl:param name="rfc.max" select="50"/> +<xsl:param name="dac.max" select="10"/> +<xsl:param name="fanout.max" select="10"/> +<xsl:param name="cbo.max" select="15"/> +<xsl:param name="lcom.max" select="10"/> +<xsl:param name="nocl.max" select="10"/> + + + +<xsl:variable name="doctree.var"> + <xsl:element name="classes"> + <xsl:for-each select=".//class"> + <xsl:element name="class"> + <xsl:attribute name="package"> + <xsl:value-of select="(ancestor::package)[last()]/@name"/> + </xsl:attribute> + <xsl:copy-of select="@*"/> + <xsl:attribute name="name"> + <xsl:apply-templates select="." mode="class.name"/> + </xsl:attribute> + <xsl:copy-of select="method"/> + </xsl:element> + </xsl:for-each> + </xsl:element> +</xsl:variable> + +<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/> + +<xsl:template match="metrics"> + +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + + <redirect:write file="{$output.dir}/metrics-reference.html"> + <xsl:call-template name="metrics-reference.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select=".//package"/> +</xsl:template> + + +<xsl:template match="package"> + <xsl:variable name="package.name" select="@name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="translate($package.name,'.','/')"/></xsl:if> + <xsl:if test="$package.name = 'unnamed package'">.</xsl:if> + </xsl:variable> +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:apply-templates select="." mode="classes.list"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:apply-templates select="." mode="package.summary"/> + </redirect:write> + +  +  + <xsl:for-each select="$doctree/classes/class[@package = current()/@name]"> +  + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + + + +<xsl:template match="class" mode="class.name"> + <xsl:if test="parent::class"><xsl:apply-templates select="parent::class" mode="class.name"/>.<xsl:value-of select="@name"/></xsl:if><xsl:if test="not(parent::class)"><xsl:value-of select="@name"/></xsl:if> +</xsl:template> + + +<xsl:template name="index.html"> +<HTML> + <HEAD><TITLE>Metrics Results.</TITLE></HEAD> + <FRAMESET cols="20%,80%"> + <FRAMESET rows="30%,70%"> + <FRAME src="overview-frame.html" name="packageListFrame"/> + <FRAME src="allclasses-frame.html" name="classListFrame"/> + </FRAMESET> + <FRAME src="overview-summary.html" name="classFrame"/> + </FRAMESET> + <noframes> + <H2>Frame Alert</H2> + <P> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </P> + </noframes> +</HTML> +</xsl:template> + + +<xsl:template name="metrics-reference.html"> +<html> +<head> +<link title="Style" type="text/css" rel="stylesheet" href="stylesheet.css"/> +</head> +<body style="text-align:justify;"> +<h2>Metrics Reference</h2> +<a href="#V(G)">V(G)</a> | +<a href="#LOC">LOC</a> | +<a href="#DIT">DIT</a> | +<a href="#NOA">NOA</a> | +<a href="#NRM">NRM</a> | +<a href="#NLM">NLM</a> | +<a href="#WMC">WMC</a> | +<a href="#RFC">RFC</a> | +<a href="#DAC">DAC</a> | +<a href="#FANOUT">FANOUT</a> | +<a href="#CBO">CBO</a> | +<a href="#LCOM">LCOM</a> | +<a href="#NOC">NOC</a> + +<a name="V(G)"/> +<h3>Cyclomatic Complexity - V(G)</h3> +This metric was introduced in the 1970s to measure the amount of control +flow complexity or branching complexity in a module such as a +subroutine. It gives the number of paths that may be taken through the +code, and was initially developed to give some measure of the cost of +producing a test case for the module by executing each path. +<p/> +Methods with a high cyclomatic complexity tend to be more difficult to +understand and maintain. In general the more complex the methods of an +application, the more difficult it will be to test it, and this will adversely +affect its reliability. +<p/> +V(G) is a measure of the control flow complexity of a method or +constructor. It counts the number of branches in the body of the method, +defined as: +<ul> +<li>while statements;</li> +<li>if statements;</li> +<li>for statements.</li> +</ul> + +The metric can also be configured to count each case of a switch +statement as well. + +<a name="LOC"/> +<h3>Lines of Code - LOC</h3> + +This is perhaps the simplest of all the metrics to define and compute. +Counting lines has a long history as a software metric dating from before +the rise of structured programming, and it is still in widespread use today. +The size of a method affects the ease with which it can be understood, its +reusability and its maintainability. There are a variety of ways that the size +can be calculated. These include counting all the lines of code, the number +of statements, the blank lines of code, the lines of commentary, and the +lines consisting only of syntax such as block delimiters. +<p/> +This metric can also be used for sizing other constructs as well, for +example, the overall size of a Java class or package can be measured by +counting the number of source lines it consists of. +<p/> +LOC can be used to determine the size of a compilation unit (source file), +class or interface, method, constructor, or field. It can be configured to +ignore: +<ul> +<li>blank lines;</li> +<li>lines consisting only of comments;</li> +<li>lines consisting only of opening and closing braces.</li> +</ul> + +<a name="DIT"/> +<h3>Depth of Inheritance Hierarchy - DIT</h3> + +This metric calculates how far down the inheritance hierarchy a class is +declared. In Java all classes have java.lang.Object as their ultimate +superclass, which is defined to have a depth of 1. So a class that +immediately extends java.lang.Object has a metric value of 2; any of its +subclasses will have a value of 3, and so on. +<p/> +A class that is deep within the tree inherits more methods and state +variables, thereby increasing its complexity and making it difficult to +predict its behavior. It can be harder to understand a system with many +inheritance layers. +<p/> +DIT is defined for classes and interfaces: +<ul> +<li>all interface types have a depth of 1;</li> +<li>the class java.lang.Object has a depth of 1;</li> +<li>all other classes have a depth of 1 + the depth of their super class.</li> +</ul> + +<a name="NOA"/> +<h3>Number of Attributes - NOA</h3> + +The number of distinct state variables in a class serves as one measure of +its complexity. The more state a class represents the more difficult it is to +maintain invariants for it. It also hinders comprehensibility and reuse. +<p/> +In Java, state can be exposed to subclasses through protected fields, which +entails that the subclass also be aware of and maintain any invariants. This +interference with the class's data encapsulation can be a source of defects +and hidden dependencies between the state variables. +<p/> +NOA is defined for classes and interfaces. It counts the number of fields +declared in the class or interface. + +<a name="NRM"/> +<h3>Number of Remote Methods - NRM</h3> + +NRM is defined for classes. A remote method call is defined as an +invocation of a method that is not declared in any of: +<ul> +<li>the class itself;</li> +<li>a class or interface that the class extends or implements;</li> +<li>a class or method that extends the class.</li> +</ul> + +The value is the count of all the remote method calls in all of the methods +and constructors of the class. + +<a name="NLM"/> +<h3>Number of Local Methods - NLM</h3> + +NLM is defined for classes and interfaces. A local method is defined as a +method that is declared in the class or interface. NLM can be configured to +include the local methods of all of the class's superclasses. Methods with +public, protected, package and private visibility can be independently +counted by setting configuration parameters. + +<a name="WMC"/> +<h3>Weighted Methods per Class - WMC</h3> + +If the number of methods in a class can be determined during the design +and modeling phase of a project, it can be used as a predictor of how +much time and effort is needed to develop, debug and maintain it. This +metric can be further refined by incorporating a weighting for the +complexity of each method. The usual weighting is given by the cyclomatic +complexity of the method. +<p/> +The subclasses of a class inherit all of its public and protected methods, +and possibly its package methods as well, so the number of methods a +class has directly impacts the complexity of its subclasses. Classes with +large numbers of methods are often specific to a particular application, +reducing the ability to reuse them. +<p/> +The definition of WMC is based upon NLM, and it provides the same +configuration parameters for counting inherited methods and of varying +visibility. The main difference is that NLM always counts each method as 1, +whereas WMC will weight each method. There are two weighting schemes: +<ul> +<li>V(G) the cyclomatic complexity of the method is used as its weight. + Methods from class files are given a V(G) of 1.</li> +<li>the arity, or the number of parameters of the method are used to + determine the weight.</li> +</ul> + +<a name="RFC"/> +<h3>Response For Class - RFC</h3> + +The response set of a class is the set of all methods that can be invoked as +a result of a message sent to an object of the class. This includes methods +in the class's inheritance hierarchy and methods that can be invoked on +other objects. The Response For Class metric is defined to be size of the +response set for the class. A class which provides a larger response set is +considered to be more complex than one with a smaller response set. +<p/> +One reason for this is that if a method call on a class can result in a large +number of different method calls on the target and other classes, then it +can be harder to test the behavior of the class and debug problems. It will +typically require a deeper understanding of the potential interactions that +objects of the class can have with the rest of the system. +<p/> +RFC is defined as the sum of NLM and NRM for the class. The local methods +include all of the public, protected, package and private methods, but not +methods declared only in a superclass. + +<a name="DAC"/> +<h3>Data Abstraction Coupling - DAC</h3> + +DAC is defined for classes and interfaces. It counts the number of reference +types that are used in the field declarations of the class or interface. The +component types of arrays are also counted. Any field with a type that is +either a supertype or a subtype of the class is not counted. + +<a name="FANOUT"/> +<h3>Fan Out - FANOUT</h3> + +FANOUT is defined for classes and interfaces, constructors and methods. It +counts the number of reference types that are used in: +<ul> +<li>field declarations;</li> +<li>formal parameters and return types;</li> +<li>throws declarations;</li> +<li>local variables.</li> +</ul> + +The component types of arrays are also counted. Any type that is either a +supertype or a subtype of the class is not counted. + +<a name="CBO"/> +<h3>Coupling Between Objects - CBO</h3> + +When one object or class uses another object or class they are said to be +coupled. One major source of coupling is that between a superclass and a +subclass. A coupling is also introduced when a method or field in another +class is accessed, or when an object of another class is passed into or out +of a method invocation. Coupling Between Objects is a measure of the +non-inheritance coupling between two objects. +<p/> +A high value of coupling reduces the modularity of the class and makes +reuse more difficult. The more independent a class is the more likely it is +that it will be possible to reuse it in another part of the system. When a +class is coupled to another class it becomes sensitive to changes in that +class, thereby making maintenance for difficult. In addition, a class that is +overly dependent on other classes can be difficult to understand and test in +isolation. +<p/> +CBO is defined for classes and interfaces, constructors and methods. It +counts the number of reference types that are used in: +<ul> +<li>field declarations</li> +<li>formal parameters and return types</li> +<li>throws declarations</li> +<li>local variables</li> +</ul> + +It also counts: +<ul> +<li>types from which field and method selections are made</li> +</ul> + +The component types of arrays are also counted. Any type that is either a +supertype or a subtype of the class is not counted. + +<a name="LCOM"/> +<h3>Lack of Cohesion Of Methods - LCOM</h3> + +The cohesion of a class is the degree to which its methods are related to +each other. It is determined by examining the pattern of state variable +accesses within the set of methods. If all the methods access the same state +variables then they have high cohesion; if they access disjoint sets of +variables then the cohesion is low. An extreme example of low cohesion +would be if none of the methods accessed any of the state variables. + +If a class exhibits low method cohesion it indicates that the design of the +class has probably been partitioned incorrectly, and could benefit by being +split into more classes with individually higher cohesion. On the other +hand, a high value of cohesion (a low lack of cohesion) implies that the +class is well designed. A cohesive class will tend to provide a high degree +of encapsulation, whereas a lack of cohesion decreases encapsulation and +increases complexity. +<p/> +Another form of cohesion that is useful for Java programs is cohesion +between nested and enclosing classes. A nested class that has very low +cohesion with its enclosing class would probably better designed as a peer +class rather than a nested class. +<p/> +LCOM is defined for classes. Operationally, LCOM takes each pair of +methods in the class and determines the set of fields they each access. If +they have disjoint sets of field accesses increase the count P by one. If they +share at least one field access then increase Q by one. After considering +each pair of methods, +LCOM = (P > Q) ? (P - Q) : 0 +<p/> +Indirect access to fields via local methods can be considered by setting a +metric configuration parameter. + +<a name="NOC"/> +<h3>Number Of Classes - NOC</h3> + +The overall size of the system can be estimated by calculating the number +of classes it contains. A large system with more classes is more complex +than a smaller one because the number of potential interactions between +objects is higher. This reduces the comprehensibility of the system which +in turn makes it harder to test, debug and maintain. +<p/> +If the number of classes in the system can be projected during the initial +design phase of the project it can serve as a base for estimating the total +effort and cost of developing, debugging and maintaining the system. +<p/> +The NOC metric can also usefully be applied at the package and class level +as well as the total system. +<p/> +NOCL is defined for class and interfaces. It counts the number of classes or +interfaces that are declared. This is usually 1, but nested class declarations +will increase this number. +</body> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + .Error { + font-weight:bold; color:red; + } + +</xsl:template> + + +<xsl:template match="class" mode="class.details"> +  + <xsl:variable name="package.name" select="@package"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + + <H3>Class <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + + <H3>Methods</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="method.metrics.header"/> + <xsl:apply-templates select="method" mode="print.metrics"/> + </table> + + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template match="package" mode="classes.list"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2> + </td> + </tr> + </table> + + <H2>Classes</H2> + <TABLE WIDTH="100%"> +  + <xsl:for-each select="$doctree/classes/class[@package = current()/@name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </TABLE> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template match="metrics" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="''"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="$doctree/classes/class"> + <xsl:sort select="@name"/> + <xsl:apply-templates select="." mode="all.classes"/> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name" select="@name"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='unnamed package')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if> + <xsl:value-of select="$class.name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="$class.name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="metrics" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="./package/@name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select=".//package[not(./@name = 'unnamed package')]" mode="all.packages"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="package" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="metrics" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="''"/> + </xsl:call-template> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th><a href="metrics-reference.html#V(G)">V(G)</a></th> + <th><a href="metrics-reference.html#LOC">LOC</a></th> + <th><a href="metrics-reference.html#DIT">DIT</a></th> + <th><a href="metrics-reference.html#NOA">NOA</a></th> + <th><a href="metrics-reference.html#NRM">NRM</a></th> + <th><a href="metrics-reference.html#NLM">NLM</a></th> + <th><a href="metrics-reference.html#WMC">WMC</a></th> + <th><a href="metrics-reference.html#RFC">RFC</a></th> + <th><a href="metrics-reference.html#DAC">DAC</a></th> + <th><a href="metrics-reference.html#FANOUT">FANOUT</a></th> + <th><a href="metrics-reference.html#CBO">CBO</a></th> + <th><a href="metrics-reference.html#LCOM">LCOM</a></th> + <th><a href="metrics-reference.html#NOCL">NOCL</a></th> + </tr> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Metrics evaluate the quality of software by analyzing the program source and quantifying + various kind of complexity. Complexity is a common source of problems and defects in software. + High complexity makes it more difficult to develop, understand, maintain, extend, test and debug + a program. + <p/> + The primary use of metrics is to focus your attention on those parts of code that potentially are + complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial + actions. + For additional information about metrics and their meaning, please consult + Metamata Metrics manual. + </td> + </tr> + </table> + + <h3>Packages</h3> + <table border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:for-each select=".//package[not(@name = 'unnamed package')]"> + <xsl:sort select="@name" order="ascending"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </xsl:for-each> + </table> +  + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + +<xsl:template match="package" mode="package.summary"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <body onload="open('package-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> +  + <h3>Package <xsl:value-of select="@name"/></h3> + + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Metrics evaluate the quality of software by analyzing the program source and quantifying + various kind of complexity. Complexity is a common source of problems and defects in software. + High complexity makes it more difficult to develop, understand, maintain, extend, test and debug + a program. + <p/> + The primary use of metrics is to focus your attention on those parts of code that potentially are + complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial + actions. + For additional information about metrics and their meaning, please consult + Metamata Metrics manual. + </td> + </tr> + </table> + + <xsl:variable name="classes-in-package" select="$doctree/classes/class[@package = current()/@name]"/> + <xsl:if test="count($classes-in-package) > 0"> + <H3>Classes</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:for-each select="$classes-in-package"> + <xsl:sort select="@name"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </xsl:for-each> + </table> + </xsl:if> + + <xsl:call-template name="pageFooter"/> + </body> + </HTML> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + + +<xsl:template name="pageHeader"> + +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Metrics</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Metrics</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + +<xsl:template name="all.metrics.header"> + <tr> + <th width="80%">Name</th> + <th nowrap="nowrap">V(G)</th> + <th>LOC</th> + <th>DIT</th> + <th>NOA</th> + <th>NRM</th> + <th>NLM</th> + <th>WMC</th> + <th>RFC</th> + <th>DAC</th> + <th>FANOUT</th> + <th>CBO</th> + <th>LCOM</th> + <th>NOCL</th> + </tr> +</xsl:template> + + +<xsl:template name="method.metrics.header"> + <tr> + <th width="80%">Name</th> + <th nowrap="nowrap">V(G)</th> + <th>LOC</th> + <th>FANOUT</th> + <th>CBO</th> + </tr> +</xsl:template> + + +<xsl:template match="method" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:apply-templates select="@name"/></td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + </tr> +</xsl:template> + + +<xsl:template match="class" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@dit"/></td> + <td><xsl:apply-templates select="@noa"/></td> + <td><xsl:apply-templates select="@nrm"/></td> + <td><xsl:apply-templates select="@nlm"/></td> + <td><xsl:apply-templates select="@wmc"/></td> + <td><xsl:apply-templates select="@rfc"/></td> + <td><xsl:apply-templates select="@dac"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + <td><xsl:apply-templates select="@lcom"/></td> + <td><xsl:apply-templates select="@nocl"/></td> + </tr> +</xsl:template> + +<xsl:template match="file|package" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@dit"/></td> + <td><xsl:apply-templates select="@noa"/></td> + <td><xsl:apply-templates select="@nrm"/></td> + <td><xsl:apply-templates select="@nlm"/></td> + <td><xsl:apply-templates select="@wmc"/></td> + <td><xsl:apply-templates select="@rfc"/></td> + <td><xsl:apply-templates select="@dac"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + <td><xsl:apply-templates select="@lcom"/></td> + <td><xsl:apply-templates select="@nocl"/></td> + </tr> +</xsl:template> + +<xsl:template match="metrics" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> +  + <td><xsl:apply-templates select="./package/@vg"/></td> + <td><xsl:apply-templates select="./package/@loc"/></td> + <td><xsl:apply-templates select="./package/@dit"/></td> + <td><xsl:apply-templates select="./package/@noa"/></td> + <td><xsl:apply-templates select="./package/@nrm"/></td> + <td><xsl:apply-templates select="./package/@nlm"/></td> + <td><xsl:apply-templates select="./package/@wmc"/></td> + <td><xsl:apply-templates select="./package/@rfc"/></td> + <td><xsl:apply-templates select="./package/@dac"/></td> + <td><xsl:apply-templates select="./package/@fanout"/></td> + <td><xsl:apply-templates select="./package/@cbo"/></td> + <td><xsl:apply-templates select="./package/@lcom"/></td> + <td><xsl:apply-templates select="./package/@nocl"/></td> + </tr> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + + + + + + <xsl:template match="@vg"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$vg.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@loc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$loc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@dit"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$dit.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@noa"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$noa.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nrm"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nrm.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nlm"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nlm.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@wmc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$wmc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@rfc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$rfc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@dac"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$dac.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@fanout"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$fanout.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@cbo"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$cbo.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@lcom"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$lcom.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nocl"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nocl.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template name="display-value"> + <xsl:param name="value"/> + <xsl:param name="max"/> + <xsl:if test="$value > $max"> + <xsl:attribute name="class">Error</xsl:attribute> + </xsl:if> + <xsl:value-of select="$value"/> + </xsl:template> + +</xsl:stylesheet> + Added: trunk/tools/ant/etc/tagdiff.xsl =================================================================== --- trunk/tools/ant/etc/tagdiff.xsl (rev 0) +++ trunk/tools/ant/etc/tagdiff.xsl 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,179 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0"> + <xsl:param name="title"/> + <xsl:param name="module"/> + <xsl:param name="cvsweb"/> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="*"> + <xsl:copy> + <xsl:copy-of select="attribute::*[. != '']"/> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + + <xsl:template match="tagdiff"> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <style type="text/css"> + body, p { + font-family: verdana,arial,helvetica; + font-size: 80%; + color:#000000; + } + .dateAndAuthor { + font-family: verdana,arial,helvetica; + font-size: 80%; + font-weight: bold; + text-align:left; + background:#a6caf0; + } + tr, td{ + font-family: verdana,arial,helvetica; + font-size: 80%; + background:#eeeee0; + } + </style> + </head> + <body link="#000000" alink="#000000" vlink="#000000" text="#000000"> + <h1> + <a name="top"><xsl:value-of select="$title"/></a> + </h1> + Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and + <xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/> + <p align="right">Designed for use with <a href="http://ant.apache.org/">Ant</a>.</p> + <hr size="2"/> + <a name="TOP"/> + <table width="100%"> + <tr> + <td align="right"> + <a href="#New">New Files</a> | + <a href="#Modified">Modified Files</a> | + <a href="#Removed">Removed Files</a> + </td> + </tr> + </table> + <table border="0" width="100%" cellpadding="3" cellspacing="1"> + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">New Files</xsl:with-param> + <xsl:with-param name="anchor">New</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[file/revision][not(file/prevrevision)]"/> + </xsl:call-template> + + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">Modified Files</xsl:with-param> + <xsl:with-param name="anchor">Modified</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/> + </xsl:call-template> + +  + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">Removed Files</xsl:with-param> + <xsl:with-param name="anchor">Removed</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/> + </xsl:call-template> + </table> + + </body> + </html> + </xsl:template> + + <xsl:template name="show-entries"> + <xsl:param name="title"/> + <xsl:param name="anchor"/> + <xsl:param name="entries"/> + <tr> + <td colspan="2" class="dateAndAuthor"> + <a> + <xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute> + <xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries + </a> + <a href="#TOP">(back to top)</a> + </td> + </tr> + <tr> + <td width="20"> + <xsl:text> </xsl:text> + </td> + <td> + <ul> + <xsl:apply-templates select="$entries"/> + </ul> + </td> + </tr> + </xsl:template> + + <xsl:template match="entry"> + <xsl:apply-templates select="file"/> + </xsl:template> + + <xsl:template match="date"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="time"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="author"> + <i> + <a> + <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> + <xsl:value-of select="."/> + </a> + </i> + </xsl:template> + + <xsl:template match="file"> + <li> + <a target="_new"> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute> + <xsl:value-of select="name" /> + </a> + <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0"> + <xsl:text> </xsl:text> + <a target="_new"> + <xsl:choose> + <xsl:when test="string-length(prevrevision) = 0 "> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute> + </xsl:otherwise> + </xsl:choose> (<xsl:if test="count(prevrevision) > 0"> <xsl:value-of select="prevrevision"/> --> </xsl:if> <xsl:value-of select="revision"/>) + </a> + </xsl:if> + </li> + </xsl:template> + +  + <xsl:template match="msg"> + <b><xsl:apply-templates/></b> + </xsl:template> + +</xsl:stylesheet> Added: trunk/tools/ant/fetch.xml =================================================================== --- trunk/tools/ant/fetch.xml (rev 0) +++ trunk/tools/ant/fetch.xml 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,233 @@ +<?xml version="1.0"?> + + + +<project name="fetch" default="all" basedir="."> + +<description> + This build file downloads JAR files that optional Ant tasks use, + and installs them in a location that is accessible the next time Ant runs. + + You can choose three locations, by going -Ddest=LOCATION on the command line + -Ddest=user user lib dir ${user.home}/.ant/lib + -Ddest=system ant lib dir ${ant.home}/lib --Default-- + -Ddest=optional optional dir ${ant.home}/lib/optional (for Ant developers) + + You may also need to set proxy settings. On Java1.5, Ant tries to get + this from the OS, unless you use the -noproxy option. + + Proxies can be configured manually setting the JVM proxy values in the + ANT_OPTS environment variable. + + For example, to set the proxy up in the tcsh shell, the command would be + something like: + + For csh/tcsh: + setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" + For bash: + export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" + For Windows, set the environment variable in the appropriate dialog box + and open a new console. or, by hand + set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 +</description> + +  + <property file="${user.home}/.ant/ant.properties"/> + <property name="lib.dir" location="lib" /> + <property name="optional.dir" location="${lib.dir}/optional" /> + <property name="userlib.dir" location="${user.home}/.ant/lib" /> + +  + <property file="${lib.dir}/libraries.properties"/> + + <import file="get-m2.xml" /> + + <target name="pick-dest"> + <property name="dest" value="system" /> + <condition property="dest.dir" + value="${lib.dir}"> + <equals arg1="${dest}" arg2="system" /> + </condition> + <condition property="dest.dir" + value="${optional.dir}"> + <equals arg1="${dest}" arg2="optional" /> + </condition> + <condition property="dest.dir" + value="${userlib.dir}"> + <equals arg1="${dest}" arg2="user" /> + </condition> + <fail unless="dest.dir">Unknown destination : ${dest}</fail> + <echo>Downloading to ${dest.dir}</echo> + <property name="m2.dest.dir" value="${dest.dir}" /> + </target> + + + <target name="macros" depends="pick-dest,get-m2" + xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + + <macrodef name="f2"> + <attribute name="project" /> + <attribute name="archive" default="@{project}"/> + <sequential> + <fail> + Unknown archive @{archive} -no property @{archive}.version defined. + <condition> + <not> + <isset property="@{archive}.version"/> + </not> + </condition> + </fail> + <artifact:dependencies pathID="@{archive}.path"> + <dependency groupID="@{project}" + artifactID="@{archive}" + version="${(a){archive}.version}"/> + </artifact:dependencies> +  + <copypath destdir="${dest.dir}" pathref="@{archive}.path"> + <flattenmapper/> + </copypath> + </sequential> + </macrodef> + </target> + + + +  + <target name="init" depends="macros" /> + + + <target name="diag" depends="init"> + <echoproperties /> + </target> + + <target name="logging" + description="load logging libraries" + depends="init"> + <f2 project="log4j" /> + <f2 project="commons-logging" archive="commons-logging-api" /> + </target> + + <target name="junit" + description="load junit libraries" + depends="init"> + <f2 project="junit" /> + </target> + + <target name="xml" + description="load full XML libraries (xalan, resolver)" + depends="init"> + <f2 project="xalan" /> + <f2 project="xml-resolver" /> + </target> + +  + + <target name="xerces" + description="load an updated version of Xerces" + depends="init"> + <f2 project="xerces" archive="xercesImpl"/> + <f2 project="xerces" archive="xml-apis" /> + </target> + + <target name="networking" + description="load networking libraries (commons-net; jsch)" + depends="init"> + <f2 project="commons-net" /> + <f2 project="com.jcraft" archive="jsch"/> + </target> + + <target name="regexp" + description="load regexp libraries" + depends="init"> + <f2 project="regexp" /> + <f2 project="oro" /> + </target> + + <target name="antlr" + description="load antlr libraries" + depends="init"> + <f2 project="antlr" /> + </target> + + <target name="bcel" + description="load bcel libraries" + depends="init"> + <f2 project="bcel" /> + </target> + + <target name="jdepend" + description="load jdepend libraries" + depends="init"> + <f2 project="jdepend" /> + </target> + + <target name="bsf" + description="load bsf libraries" + depends="init"> + <f2 project="bsf" /> + </target> + + <target name="jruby" + description="load jruby" + depends="bsf"> + <f2 project="org.jruby" archive="jruby"/> + </target> + + <target name="beanshell" + description="load beanshell support" + depends="bsf"> + <f2 project="org.beanshell" archive="bsh"/> + <f2 project="org.beanshell" archive="bsh-core"/> + </target> + + <target name="jython" + description="load jython" + depends="bsf"> + <f2 project="jython" archive="jython"/> + </target> + + <target name="rhino" + description="load rhino" + depends="bsf"> + <f2 project="rhino" archive="js"/> + </target> + + <target name="script" + description="load script languages" + depends="bsf,jruby,jython,beanshell,rhino"/> + + <target name="debugging" + description="internal ant debugging" + depends="init"> + <f2 project="which" /> + </target> + + <target name="all" + description="load all the libraries" + depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script" /> + +</project> Added: trunk/tools/ant/get-m2.xml =================================================================== --- trunk/tools/ant/get-m2.xml (rev 0) +++ trunk/tools/ant/get-m2.xml 2009-10-13 16:16:57 UTC (rev 8095) @@ -0,0 +1,121 @@ +<?xml version="1.0"?> + + + +<project name="get-m2" default="get-m2" basedir="."> + +<description> + This build file downloads the Maven2 Ant tasks, + and installs them in the location specified by the m2.dest.dir property. + + You may need to set proxy settings. On Java1.5, Ant tries to get + this from the OS, unless you use the -noproxy option. + + Proxies can be configured manually setting the JVM proxy values in the + ANT_OPTS environment variable. + + For example, to set the proxy up in the tcsh shell, the command would be + something like: + + For csh/tcsh: + setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" + For bash: + export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" + For Windows, set the environment variable in the appropriate dialog box + and open a new console. or, by hand + set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 +</description> + + <property file="get-m2.properties" /> + + <property name="m2.antlib.resource" + value="org/apache/maven/artifact/ant/antlib.xml" /> + + <property name="m2.antlib.uri" + value="antlib:org.apache.maven.artifact.ant" /> + + <macrodef name="require"> + <attribute name="property" /> + <sequential> + <fail unless="@{property}">$${@{property}} not specified</fail> + </sequential> + </macrodef> + + <target name="probe-m2"> + <require property="m2.dest.dir" /> + <require property="m2.jar.name" /> + +  + <property name="m2.artifact" location="${m2.dest.dir}/${m2.jar.name}" /> + <available property="m2.antlib.found" resource="${m2.antlib.resource}" /> + <condition property="m2.antlib.typefound"> + <typefound name="${m2.antlib.uri}:artifact" /> + </condition> + <available property="m2.artifact.found" file="${m2.artifact}" type="file" /> + </target> + + <target name="download-m2" depends="probe-m2" unless="m2.artifact.found"> + <require property="m2.antlib.url" /> + <echo>Downloading to ${m2.dest.dir}</echo> + + <mkdir dir="${m2.dest.dir}" /> +  + <get src="${m2.antlib.url}" + dest="${m2.artifact}" + verbose="true" + usetimestamp="false" /> + </target> + + <target name="dont-validate-m2-checksum" depends="probe-m2" + if="m2.artifact.found"> + <property name="checksum.equal" value="true" /> + </target> + + <target name="validate-m2-checksum" + depends="download-m2,dont-validate-m2-checksum" + if="m2.sha1.checksum" unless="m2.artifact.found"> + <checksum file="${m2.artifact}" + algorithm="SHA" + property="${m2.sha1.checksum}" + verifyProperty="checksum.equal" /> + </target> + + <target name="checksum-mismatch" depends="validate-m2-checksum" + if="m2.sha1.checksum" unless="checksum.equal"> + <delete file="${m2.artifact}" /> + <fail> + Failed to verify the downloaded file ${m2.antlib.url}" against the checksum + coded into libraries.properties. + The local copy has been deleted, for security reasons + </fail> + </target> + + <target name="checksum-match" depends="checksum-mismatch" + unless="m2.antlib.found"> + <taskdef classpath="${m2.artifact}" resource="${m2.antlib.resource}" + uri="${m2.antlib.uri}" /> + </target> + + <target name="get-m2" depends="checksum-match" + description="Download the Maven2 Ant tasks" /> + +</project> Added: trunk/tools/ant/lib/ant-antlr.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-antlr.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-bcel.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-bcel.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-bsf.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-bsf.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-log4j.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-log4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-oro.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-oro.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-regexp.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-regexp.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-apache-resolver.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-apache-resolver.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-commons-net.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-commons-net.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-jai.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-jai.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-javamail.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-javamail.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-jdepend.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-jdepend.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-jmf.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-jmf.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-jsch.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-jsch.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-junit.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-junit.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-launcher.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-launcher.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-netrexx.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-netrexx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-nodeps.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-nodeps.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-starteam.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-starteam.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-stylebook.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-stylebook.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-swing.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-swing.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-testutil.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-testutil.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-trax.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-trax.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant-weblogic.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant-weblogic.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/ant.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/ant.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/xercesImpl.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/xercesImpl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/ant/lib/xml-apis.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/ant/lib/xml-apis.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8094 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 11:39:49 -0400 (Tue, 13 Oct 2009) New Revision: 8094 Modified: trunk/docs/user-manual/en/using-jms.xml Log: "Using JMS" documentation * added a note about JNDIServer bean being required only in stand-alone mode Modified: trunk/docs/user-manual/en/using-jms.xml =================================================================== --- trunk/docs/user-manual/en/using-jms.xml 2009-10-13 15:03:46 UTC (rev 8093) +++ trunk/docs/user-manual/en/using-jms.xml 2009-10-13 15:39:49 UTC (rev 8094) @@ -105,9 +105,7 @@ is the port used by the JNDI server and may vary depending on how you have configured your JNDI server.</para> <para>In the default standalone configuration, JNDI server ports are configured in the file - <literal>hornetq-beans.xml</literal> (or <literal>hornetq-beans.xml</literal> if - you're running JBoss Application Server) where the JNDIServer bean is confgured, here's - a snippet from the file:</para> + <literal>hornetq-beans.xml</literal> by setting properties on the <literal>JNDIServer</literal> bean:</para> <programlisting> <bean name="JNDIServer" class="org.jnp.server.Main"> <property name="namingInfo"> @@ -124,6 +122,12 @@ change it's bind address to something other than <literal >localhost</literal>!</para> </note> + <note> + <para>The JNDIServer bean must be defined <emphasis>only when HornetQ is running in stand-alone mode</emphasis>. + When HornetQ is integrated to JBoss Application Server, JBoss AS will provide a ready-to-use + JNDI server without any additional configuration.</para> + </note> + </section> <section> <title>The code</title>

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8092 - in trunk: src/main/org/hornetq/core/config/impl and 1 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 10:28:25 -0400 (Tue, 13 Oct 2009) New Revision: 8092 Modified: trunk/docs/user-manual/en/configuration-index.xml trunk/docs/user-manual/en/perf-tuning.xml trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java Log: https://jira.jboss.org/jira/browse/HORNETQ-164: Allow MemoryManager to be disabled * allowed memory-measure-interval to set to -1 to disable MemoryManager * added documentation for memory-measure-interval & memory-warning-threshold in configuration index + memory settings chapter Modified: trunk/docs/user-manual/en/configuration-index.xml =================================================================== --- trunk/docs/user-manual/en/configuration-index.xml 2009-10-13 13:01:11 UTC (rev 8091) +++ trunk/docs/user-manual/en/configuration-index.xml 2009-10-13 14:28:25 UTC (rev 8092) @@ -394,6 +394,20 @@ <entry>true</entry> </row> <row> + <entry><link linkend="perf-tuning.memory" + >memory-measure-interval</link></entry> + <entry>Long</entry> + <entry>frequency to sample JVM memory in ms (or -1 to disable memory sampling)</entry> + <entry>30000</entry> + </row> + <row> + <entry><link linkend="perf-tuning.memory" + >memory-warning-threshold</link></entry> + <entry>Integer</entry> + <entry>Percentage of available memory which threshold a warning log</entry> + <entry>25</entry> + </row> + <row> <entry><link linkend="configuring-transports.acceptors" >acceptors</link></entry> <entry>Acceptor</entry> Modified: trunk/docs/user-manual/en/perf-tuning.xml =================================================================== --- trunk/docs/user-manual/en/perf-tuning.xml 2009-10-13 13:01:11 UTC (rev 8091) +++ trunk/docs/user-manual/en/perf-tuning.xml 2009-10-13 14:28:25 UTC (rev 8092) @@ -193,7 +193,7 @@ garbage collection algorithm, e.g. using the JVM argument <literal >-XX:+UseParallelGC</literal> on Sun JDKs.</para> </listitem> - <listitem> + <listitem id="perf-tuning.memory"> <para>Memory settings. Give as much memory as you can to the server. HornetQ can run in low memory by using paging (described in <xref linkend="paging"/>) but if it can run with all queues in RAM this will improve performance. The amount of @@ -201,6 +201,13 @@ size and number of your messages. Use the JVM arguments <literal>-Xms</literal> and <literal>-Xmx</literal> to set server available RAM. We recommend setting them to the same high value.</para> + <para>HornetQ will regularly sample JVM memory and reports if the available memory is below + a configurable threshold. Use this information to properly set JVM memory and paging. + The sample frequency can be configured by setting <literal>memory-measure-interval</literal> + in <literal>hornetq-configuration.xml</literal> (default is 30000ms, set it to -1 to disable + memory sampling). When the available memory goes below the configured threshold, a warning is logged. + The threshold can be configured by setting <literal>memory-warning-threshold</literal> in + <literal>hornetq-configuration.xml</literal> (default is 25%).</para> </listitem> <listitem> <para>Aggressive options. Different JVMs provide different sets of JVM tuning @@ -256,7 +263,7 @@ Instead the temporary queue should be re-used for many requests.</para> </listitem> <listitem> - <para>Don't use Mesage Driven Beans for the sake of it. As soon as you start using MDBs you are greatly + <para>Don't use Message-Driven Beans for the sake of it. As soon as you start using MDBs you are greatly increasing the codepath for each message received compared to a straightforward message consumer, since a lot of extra application server code is executed. Ask yourself do you really need MDBs? Can you accomplish the same task using just a normal message consumer?</para> Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-10-13 13:01:11 UTC (rev 8091) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-10-13 14:28:25 UTC (rev 8092) @@ -332,7 +332,7 @@ memoryWarningThreshold = getInteger(e, "memory-warning-threshold", memoryWarningThreshold, PERCENTAGE); - memoryMeasureInterval = getLong(e, "memory-measure-interval", memoryMeasureInterval, GT_ZERO); // in milliseconds + memoryMeasureInterval = getLong(e, "memory-measure-interval", memoryMeasureInterval, MINUS_ONE_OR_GT_ZERO); // in milliseconds started = true; } Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-13 13:01:11 UTC (rev 8091) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-13 14:28:25 UTC (rev 8092) @@ -389,8 +389,11 @@ pagingManager.stop(); } - memoryManager.stop(); - + if (memoryManager != null) + { + memoryManager.stop(); + } + pagingManager = null; securityStore = null; resourceManager = null; @@ -938,10 +941,13 @@ scheduledPool, managementConnectorID); - memoryManager = new MemoryManagerImpl(configuration.getMemoryWarningThreshold(), - configuration.getMemoryMeasureInterval()); + if (configuration.getMemoryMeasureInterval() != -1) + { + memoryManager = new MemoryManagerImpl(configuration.getMemoryWarningThreshold(), + configuration.getMemoryMeasureInterval()); - memoryManager.start(); + memoryManager.start(); + } } private void initialiseLogging()

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8091 - in trunk/tests/src/org/hornetq/tests/integration: persistence and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 09:01:11 -0400 (Tue, 13 Oct 2009) New Revision: 8091 Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java Log: ensure created sessions are properly closed Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-10-13 12:53:06 UTC (rev 8090) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-10-13 13:01:11 UTC (rev 8091) @@ -160,6 +160,7 @@ validateNoFilesOnLargeDir(); + session.close(); } finally { Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-10-13 12:53:06 UTC (rev 8090) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-10-13 13:01:11 UTC (rev 8091) @@ -14,6 +14,7 @@ package org.hornetq.tests.integration.persistence; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.hornetq.core.client.ClientMessage; import org.hornetq.core.client.ClientProducer; @@ -93,9 +94,9 @@ { try { - count.countDown(); session.deleteQueue(ADDRESS); session.close(); + count.countDown(); } catch (HornetQException e) { @@ -103,7 +104,7 @@ } }.start(); - count.await(); + assertTrue(count.await(5, TimeUnit.SECONDS)); server.stop();

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8090 - trunk/tests/src/org/hornetq/tests/integration/jms/consumer.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 08:53:06 -0400 (Tue, 13 Oct 2009) New Revision: 8090 Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java Log: ensure created sessions are properly closed Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-10-13 12:51:26 UTC (rev 8089) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-10-13 12:53:06 UTC (rev 8090) @@ -180,6 +180,8 @@ consumer.setMessageListener(null); consumer.receiveNoWait(); + + conn.close(); } public void testCantReceiveWhenListenerIsSet() throws Exception @@ -204,5 +206,7 @@ { // Ok } + + conn.close(); } }

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8089 - in trunk/src/config: jboss-as/non-clustered and 2 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-13 08:51:26 -0400 (Tue, 13 Oct 2009) New Revision: 8089 Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml trunk/src/config/stand-alone/clustered/hornetq-jms.xml trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml Log: updated connection factory definitions to be more appropriate for app server and standalone usage Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-10-13 12:44:22 UTC (rev 8088) +++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-10-13 12:51:26 UTC (rev 8089) @@ -2,27 +2,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - <connection-factory name="ConnectionFactory"> + <connection-factory name="NettyConnectionFactory"> <connector-ref connector-name="netty"/> <entries> <entry name="ConnectionFactory"/> <entry name="XAConnectionFactory"/> </entries> </connection-factory> - - <connection-factory name="ClusteredConnectionFactory"> - <connector-ref connector-name="netty" backup-connector-name="netty-backup"/> + + <connection-factory name="InVMConnectionFactory"> + <connector-ref connector-name="in-vm"/> <entries> - <entry name="/ClusteredConnectionFactory"/> - <entry name="/ClusteredXAConnectionFactory"/> - <entry name="java:/ClusteredConnectionFactory"/> - <entry name="java:/ClusteredXAConnectionFactory"/> + <entry name="java:/ConnectionFactory"/> + <entry name="java:/XAConnectionFactory"/> </entries> </connection-factory> <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> + <queue name="ExpiryQueue"> <entry name="/queue/ExpiryQueue"/> </queue> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-10-13 12:44:22 UTC (rev 8088) +++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-10-13 12:51:26 UTC (rev 8089) @@ -2,17 +2,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - <connection-factory name="ConnectionFactory"> + <connection-factory name="NettyConnectionFactory"> <connector-ref connector-name="netty"/> <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="InVMConnectionFactory"> + <connector-ref connector-name="in-vm"/> + <entries> + <entry name="java:/ConnectionFactory"/> + <entry name="java:/XAConnectionFactory"/> + </entries> + </connection-factory> + <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> + <queue name="ExpiryQueue"> <entry name="/queue/ExpiryQueue"/> </queue> Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-10-13 12:44:22 UTC (rev 8088) +++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-10-13 12:51:26 UTC (rev 8089) @@ -2,13 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - <connection-factory name="ConnectionFactory"> + <connection-factory name="NettyConnectionFactory"> <connector-ref connector-name="netty"/> <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - <entry name="java:/ConnectionFactory"/> - <entry name="java:/XAConnectionFactory"/> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> </entries> </connection-factory> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-10-13 12:44:22 UTC (rev 8088) +++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-10-13 12:51:26 UTC (rev 8089) @@ -2,13 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - <connection-factory name="ConnectionFactory"> + <connection-factory name="NettyConnectionFactory"> <connector-ref connector-name="netty"/> <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - <entry name="java:/ConnectionFactory"/> - <entry name="java:/XAConnectionFactory"/> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> </entries> </connection-factory>

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8088 - trunk/tests/src/org/hornetq/tests/integration/server.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 08:44:22 -0400 (Tue, 13 Oct 2009) New Revision: 8088 Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java Log: ensure created sessions are properly closed Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2009-10-13 12:39:36 UTC (rev 8087) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2009-10-13 12:44:22 UTC (rev 8088) @@ -71,7 +71,11 @@ producer.send(m4); clientSessionXa.end(xid, XAResource.TMSUCCESS); clientSessionXa.prepare(xid); + + clientSession.close(); + clientSessionXa.close(); restartServer(); + clientSessionXa.commit(xid, true); ClientConsumer consumer = clientSession.createConsumer(qName1); clientSession.start(); @@ -139,7 +143,10 @@ clientSessionXa.end(xid, XAResource.TMSUCCESS); clientSessionXa.prepare(xid); + clientSession.close(); + clientSessionXa.close(); restartServer(); + clientSessionXa.rollback(xid); consumer = clientSession.createConsumer(qName1); clientSession.start();

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8087 - trunk/tests/src/org/hornetq/tests/integration/xa.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 08:39:36 -0400 (Tue, 13 Oct 2009) New Revision: 8087 Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java Log: ensure created sessions are properly closed Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2009-10-13 12:17:56 UTC (rev 8086) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2009-10-13 12:39:36 UTC (rev 8087) @@ -221,6 +221,8 @@ clientConsumer = clientSession.createConsumer(atestq); m = clientConsumer.receiveImmediate(); assertNull(m); + + clientSession2.close(); } @@ -254,6 +256,13 @@ { assertFalse(messageHandler.failedToAck); } + + clientSession2.close(); + for (ClientSession session : clientSessions) + { + session.close(); + } + } public void testSendMultipleQueues() throws Exception @@ -348,7 +357,8 @@ session.prepare(xid); session.commit(xid, false); - + session.close(); + xid = newXID(); session = sessionFactory.createSession(true, false, false); session.start(xid, XAResource.TMNOFLAGS); @@ -368,6 +378,7 @@ session.end(xid, XAResource.TMSUCCESS); session.rollback(xid); + session.close(); messagingService.stop(); messagingService.start();

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8086 - trunk/tests/src/org/hornetq/tests/integration/management.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-13 08:17:56 -0400 (Tue, 13 Oct 2009) New Revision: 8086 Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java Log: ensure created sessions are properly closed Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2009-10-13 10:20:05 UTC (rev 8085) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2009-10-13 12:17:56 UTC (rev 8086) @@ -51,10 +51,6 @@ @Override protected QueueControl createManagementControl(final SimpleString address, final SimpleString queue) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - session = sf.createSession(false, true, true); - session.start(); - return new QueueControl() { private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, @@ -275,6 +271,16 @@ // Protected ----------------------------------------------------- @Override + protected void setUp() throws Exception + { + super.setUp(); + + ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + session = sf.createSession(false, true, true); + session.start(); + } + + @Override protected void tearDown() throws Exception { if (session != null)

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8085 - trunk/tests/src/org/hornetq/tests/integration/security.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-13 06:20:05 -0400 (Tue, 13 Oct 2009) New Revision: 8085 Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java Log: closed sessions on test Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-10-13 10:13:26 UTC (rev 8084) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-10-13 10:20:05 UTC (rev 8085) @@ -58,7 +58,7 @@ private static final String addressA = "addressA"; private static final String queueA = "queueA"; - + public void testCreateSessionWithNullUserPass() throws Exception { Configuration configuration = createDefaultConfig(false); @@ -75,6 +75,8 @@ try { ClientSession session = cf.createSession(false, true, true); + + session.close(); } catch (HornetQException e) { @@ -102,7 +104,7 @@ try { ClientSession session = cf.createSession(false, true, true); - fail("should not throw exception"); + fail("should throw exception"); } catch (HornetQException e) { @@ -164,6 +166,8 @@ try { ClientSession session = cf.createSession("newuser", "apass", false, true, true, false, -1); + + session.close(); } catch (HornetQException e) { @@ -890,6 +894,8 @@ session.close(); senSession.close(); + + sendingSession.close(); } finally { @@ -1041,6 +1047,8 @@ try { ClientSession session = cf.createSession(false, true, true); + + session.close(); } catch (HornetQException e) { @@ -1217,6 +1225,16 @@ //Step 18. Check permissions on news.us.usTopic for same: can't send but can receive checkUserReceiveNoSend(usQueueName, samConnection, adminSession); + + billConnection.close(); + + andrewConnection.close(); + + frankConnection.close(); + + samConnection.close(); + + adminSession.close(); } finally {

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits October 2009