[jsword-svn] r2286 - in trunk: bibledesktop bibledesktop/etc/eclipse bibledesktop-web bibledesktop-web/etc/eclipse jsword-support/tools/checkstyle jsword-support/tools/checkstyle/checkstyle-5.3 jsword-support/tools/findbugs jsword-support/tools/java2html jsword-support/tools/javancss/javancss-32.53 jsword-support/tools/jcoverage jsword-support/tools/tomcat jsword-web jsword-web/etc/eclipse jsword-web/src/test
dmsmith at crosswire.org
dmsmith at crosswire.org
Wed Mar 6 09:27:11 MST 2013
Author: dmsmith
Date: 2013-03-06 09:27:10 -0700 (Wed, 06 Mar 2013)
New Revision: 2286
Removed:
trunk/jsword-web/src/test/java/
Modified:
trunk/bibledesktop-web/build.xml
trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
trunk/jsword-support/tools/checkstyle/build.xml
trunk/jsword-support/tools/checkstyle/checkstyle-5.3/suppressions.xml
trunk/jsword-support/tools/checkstyle/custom.xml
trunk/jsword-support/tools/findbugs/build.xml
trunk/jsword-support/tools/java2html/build.xml
trunk/jsword-support/tools/javancss/javancss-32.53/pom.xml
trunk/jsword-support/tools/jcoverage/build.xml
trunk/jsword-support/tools/tomcat/build.xml
trunk/jsword-web/.classpath
trunk/jsword-web/build.xml
trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
Log:
Build changes
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -5,26 +5,26 @@
<property name="dependency" value="jsword"/>
<!--=======================================================================-->
- <property name="jnlp.homepage" value="file:///${basedir}/${target.installed}"/> <!-- override -->
- <property name="jnlp.codebase" value="file:///${basedir}/${target.installed}"/> <!-- override -->
+ <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/> <!-- override -->
+ <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.dir}"/> <!-- override -->
- <property name="gener.root" value="${target.root}/gener"/>
+ <property name="gener.root" value="${dest.dir}/gener"/>
<property name="support.tools" value="../jsword-support/tools"/>
<!--<import file="${support.tools}/nsis/build.xml"/>-->
<!--=======================================================================-->
- <target name="testcompile.extra">
+ <target name="compile.test.extra">
<mkdir dir="${gener.root}/config"/>
<xslt
- in="${source.res}/config.xml"
- out="${gener.root}/config/ConfigTest.java"
+ in="${src.main.res.dir}/config.xml"
+ out="${gener.root}/config/Configsrc.test.java.dir"
style="../jsword/etc/config-test.xsl">
<xmlcatalog refid="commonDTDs"/>
</xslt>
<javac debug="on" includes="**/*.java" destdir="${test.classes}">
<src path="${gener.root}/config"/>
- <classpath refid="test.jarpath"/>
+ <classpath refid="classpath.test"/>
</javac>
<xmlcatalog refid="commonDTDs"/>
</target>
@@ -35,84 +35,78 @@
unless="install.uptodate"
description="Prepares for web based jnlp deploy">
- <echo message="Building distribution: installed files in: ${target.installed}"/>
+ <echo message="Building distribution: installed files in: ${dest.install.dir}"/>
<!-- Create the installation directory -->
- <mkdir dir="${target.installed}"/>
+ <mkdir dir="${dest.install.dir}"/>
<!--
== Prepare the Mac distribution as a zip file.
-->
<copy verbose="${verbose.copy}"
- file="${source.etc}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
- toFile="${target.installed}/Info.plist"
+ file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
+ toFile="${dest.install.dir}/Info.plist"
preservelastmodified="true">
<filterset>
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <zip destfile="${target.installed}/BibleDesktop.app.zip" update="true">
+ <zip destfile="${dest.install.dir}/BibleDesktop.app.zip" update="true">
<!-- Copy everything but the executable (zip will not preserve permissions)
== And Info.plist, which needs to be filtered.
-->
<zipfileset prefix="BibleDesktop.app"
- dir="${source.etc}/installer/macosx/BibleDesktop.app">
+ dir="${etc.dir}/installer/macosx/BibleDesktop.app">
<exclude name="**/*JavaApplicationStub*"/>
<exclude name="**/*Info.plist"/>
</zipfileset>
<!-- Copy the executable and set the right permissions -->
<zipfileset prefix="BibleDesktop.app/Contents/MacOS"
filemode="755"
- file="${source.etc}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+ file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
<!-- Copy the filtered Info.plist file -->
<zipfileset prefix="BibleDesktop.app/Contents"
- file="${target.installed}/Info.plist"/>
+ file="${dest.install.dir}/Info.plist"/>
<!-- Add in all the unsigned jars -->
<zipfileset prefix="BibleDesktop.app/Contents/Resources/Java"
dir="${target.jar}">
<patternset refid="internal.built.jars"/>
- <patternset refid="external.runtime.jars"/>
+ <patternset refid="patternset.runtime"/>
</zipfileset>
</zip>
- <delete file="${target.installed}/Info.plist"/>
+ <delete file="${dest.install.dir}/Info.plist"/>
- <!-- sign the jars and copy them to the installation directory -->
+ <!-- sign the jars in place -->
<signjar
- destDir="${target.installed}"
- storepass="${keystore.pswd}"
- alias="${keystore.alias}"
- keystore="${keystore.file}"
- preservelastmodified="true"
- lazy="true">
- <path>
- <fileset dir="${target.jar}">
- <patternset refid="external.runtime.jars"/>
- <patternset refid="internal.built.jars"/>
- </fileset>
- </path>
+ storepass="${keystore.pswd}"
+ alias="${keystore.alias}"
+ keystore="${keystore.file}"
+ preservelastmodified="true"
+ lazy="true">
+ <path refid="classpath.runtime"/>
</signjar>
<!-- Create a flag file used to determine whether the set of jars needs to be signed -->
- <touch file="${target.root}/.flagfile"/>
+ <touch file="${dest.dir}/.flagfile"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
- todir="${target.installed}"
+ todir="${dest.install.dir}"
preservelastmodified="true">
- <fileset dir="${source.etc}/jnlp">
+ <fileset dir="${etc.dir}/jnlp">
<include name="*.gif"/>
</fileset>
- <fileset dir="${source.etc}/bin"/>
- <fileset dir="${source.etc}/installer">
+ <fileset dir="${etc.dir}/bin"/>
+ <fileset dir="${etc.dir}/installer">
<include name="bibledesktop.exe"/>
</fileset>
</copy>
<!-- Copy and filter to make it work -->
<copy verbose="${verbose.copy}"
- file="${source.etc}/jnlp/bibledesktop.jnlp"
- tofile="${target.installed}/bibledesktop.jnlp"
+ file="${etc.dir}/jnlp/bibledesktop.jnlp"
+ tofile="${dest.install.dir}/bibledesktop.jnlp"
filtering="true"
preservelastmodified="true">
<filterset>
@@ -124,24 +118,24 @@
<!-- copy does not preserve file permissions, so we reset them -->
<chmod perm="a+x">
- <fileset dir="${target.installed}">
+ <fileset dir="${dest.install.dir}">
<include name="**/*.sh"/>
</fileset>
</chmod>
<!-- Ensure that line endings are consistent with their target platform -->
- <fixcrlf srcdir="${target.installed}" eol="lf">
+ <fixcrlf srcdir="${dest.install.dir}" eol="lf">
<include name="**/*.sh"/>
</fixcrlf>
- <fixcrlf srcdir="${target.installed}" eol="crlf">
+ <fixcrlf srcdir="${dest.install.dir}" eol="crlf">
<include name="**/*.bat"/>
</fixcrlf>
<!-- Build the Windows installers from the installed/signed jars -->
<copy verbose="${verbose.copy}"
- todir="${target.installed}"
+ todir="${dest.install.dir}"
filtering="true"
preservelastmodified="true">
- <fileset dir="${source.etc}/installer/win32">
+ <fileset dir="${etc.dir}/installer/win32">
<include name="*.nsi"/>
</fileset>
<filterset>
@@ -149,26 +143,26 @@
</filterset>
</copy>
<copy verbose="${verbose.copy}"
- todir="${target.installed}"
+ todir="${dest.install.dir}"
preservelastmodified="true">
- <fileset dir="${source.etc}/installer/win32">
+ <fileset dir="${etc.dir}/installer/win32">
<include name="*.ico"/>
<include name="gpl.txt"/>
</fileset>
</copy>
<!--
- <nsis verbosity="1" script="${target.installed}/BibleDesktop.nsi"/>
- <nsis verbosity="1" script="${target.installed}/PortableBibleDesktop.nsi"/>
- <nsis verbosity="1" script="${target.installed}/BibleDesktopSetup.nsi"/>
- <delete file="${target.installed}/BibleDesktop.nsi"/>
- <delete file="${target.installed}/PortableBibleDesktop.nsi"/>
- <delete file="${target.installed}/BibleDesktopSetup.nsi"/>
+ <nsis verbosity="1" script="${dest.install.dir}/BibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.dir}/PortableBibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.dir}/BibleDesktopSetup.nsi"/>
+ <delete file="${dest.install.dir}/BibleDesktop.nsi"/>
+ <delete file="${dest.install.dir}/PortableBibleDesktop.nsi"/>
+ <delete file="${dest.install.dir}/BibleDesktopSetup.nsi"/>
-->
</target>
<target name="install.check">
<uptodate property="install.uptodate"
- targetfile="${target.root}/.flagfile">
+ targetfile="${dest.dir}/.flagfile">
<srcfiles dir="${target.jar}"/>
</uptodate>
<echo message="install.uptodate result: ${install.uptodate}"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -15,8 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -15,8 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -12,7 +12,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop-web/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -2,11 +2,11 @@
<import file="../jsword/core.xml"/>
<property name="dependency" value="bibledesktop"/>
- <property name="dependency.install" value="../${dependency}/${target.root}/${dependency}"/>
+ <property name="dependency.install" value="../${dependency}/${dest.dir}/${dependency}"/>
<!--=======================================================================-->
- <property name="source.web" value="${source.root}/main/webapp"/>
- <property name="webapp.bibledesktop" value="${target.root}/webapp"/> <!-- override -->
+ <property name="source.web" value="${src.dir}/main/webapp"/>
+ <property name="webapp.bibledesktop" value="${dest.dir}/webapp"/> <!-- override -->
<!--=======================================================================-->
<target name="webapp" description="Build an unpacked war file">
@@ -46,7 +46,7 @@
<!-- There is nothing to build -->
</target>
- <target name="testcompile"
+ <target name="compile.test"
description="Compile the test source">
<!-- There is no test code build -->
</target>
Modified: trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
===================================================================
--- trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop-web/build.xml"/>
</listAttribute>
@@ -12,7 +12,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:bibledesktop-web}"/>
Modified: trunk/jsword-support/tools/checkstyle/build.xml
===================================================================
--- trunk/jsword-support/tools/checkstyle/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/checkstyle/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -18,7 +18,7 @@
<copy file="${support.style}/custom.xml" overwrite="true"
tofile="${target.web}/checkstyle/custom.xml">
<filterset>
- <filter token="source.java" value="${basedir}/${source.java}"/>
+ <filter token="src.main.java.dir" value="${basedir}/${src.main.java.dir}"/>
<filter token="target.checkstyle" value="${webapp.jsword}/checkstyle"/>
</filterset>
</copy>
Modified: trunk/jsword-support/tools/checkstyle/checkstyle-5.3/suppressions.xml
===================================================================
--- trunk/jsword-support/tools/checkstyle/checkstyle-5.3/suppressions.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/checkstyle/checkstyle-5.3/suppressions.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -32,8 +32,8 @@
<suppress checks="ImportControl" files=".*[\\/]src[\\/]tests[\\/]"/>
<suppress checks="Javadoc" files=".*[\\/]src[\\/]tests[\\/]"/>
<suppress checks="MagicNumber" files=".*[\\/]src[\\/]tests[\\/]"/>
- <suppress checks="MethodCount" files="[\\/]IndentationCheckTest.java$"/>
- <suppress checks="EqualsAvoidNull" files="[\\/]Int.*FilterTest.java$"/>
+ <suppress checks="MethodCount" files="[\\/]IndentationChecksrc.test.java.dir$"/>
+ <suppress checks="EqualsAvoidNull" files="[\\/]Int.*Filtersrc.test.java.dir$"/>
<!-- suppressions to remove over time -->
<suppress checks="FinalLocalVariable" files=".*[\\/]src[\\/]tests[\\/]"/>
Modified: trunk/jsword-support/tools/checkstyle/custom.xml
===================================================================
--- trunk/jsword-support/tools/checkstyle/custom.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/checkstyle/custom.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -5,7 +5,7 @@
<module name="Checker">
- <property name="basedir" value="@source.java@"/>
+ <property name="basedir" value="@src.main.java.dir@"/>
<!-- Checks for Javadoc Comments -->
<module name="JavadocPackage">
Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/findbugs/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -25,7 +25,7 @@
<class location="${target.jar}/jsword-${release.version}.jar"/>
<class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
<sourcePath>
- <dirset dir=".." includes="**/${source.java}"/>
+ <dirset dir=".." includes="**/${src.main.java.dir}"/>
</sourcePath>
<auxClasspath>
<fileset dir="${target.jar}">
Modified: trunk/jsword-support/tools/java2html/build.xml
===================================================================
--- trunk/jsword-support/tools/java2html/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/java2html/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -22,7 +22,7 @@
footer="false"
destination="${target.web}/java2html">
<fileset refid="fileset.alljava"/>
- <javadoc localRef="${source.etc}/javadoc" httpRef="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+ <javadoc localRef="${etc.dir}/javadoc" httpRef="http://download.oracle.com/javase/1.5.0/docs/api/"/>
</java2html>
</target>
Modified: trunk/jsword-support/tools/javancss/javancss-32.53/pom.xml
===================================================================
--- trunk/jsword-support/tools/javancss/javancss-32.53/pom.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/javancss/javancss-32.53/pom.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -210,7 +210,7 @@
<arguments>
<argument>-classpath</argument>
<classpath />
- <argument>javancss.test.JavancssTest</argument>
+ <argument>javancss.src.test.java.dirncssTest</argument>
</arguments>
</configuration>
<executions>
Modified: trunk/jsword-support/tools/jcoverage/build.xml
===================================================================
--- trunk/jsword-support/tools/jcoverage/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/jcoverage/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -2,7 +2,7 @@
<!-- this should be overridden by the parent file -->
<property name="support.tools" value=".."/>
- <property name="target.temp" value="${target.root}/temp"/>
+ <property name="target.temp" value="${dest.dir}/temp"/>
<!-- instrumented classes are deposited into this directory. -->
<property name="target.jcov.root" value="${target.temp}/jcoverage"/>
@@ -16,8 +16,8 @@
<!-- Location of JUnit report -->
<property name="target.web.junit" value="${target.web}/junit"/>
- <property name="source.java.jsword" value="../jsword/${source.java}"/>
- <property name="target.classes.jsword" value="../jsword/${target.classes}"/>
+ <property name="src.main.java.dir.jsword" value="../jsword/${src.main.java.dir}"/>
+ <property name="dest.main.classes.dir.jsword" value="../jsword/${dest.main.classes.dir}"/>
<property name="test.classes.jsword" value="../jsword/${test.classes}"/>
<path id="jcoverage">
@@ -51,7 +51,7 @@
<arg value="org.apache.log4j.*"/>
<arg value="-d"/>
<arg file="${target.jcov.classes}"/>
- <arg file="${target.classes.jsword}"/>
+ <arg file="${dest.main.classes.dir.jsword}"/>
</java>
<!-- Make jcoverage a lot quieter use a custom log4j.properties -->
@@ -100,7 +100,7 @@
<!-- Need to include the test code -->
<classpath location="${test.classes.jsword}"/>
<!-- And the classes that testing needs -->
- <classpath refid="test.jarpath"/>
+ <classpath refid="classpath.test"/>
<!-- Include JCoverage so it the instrumented code can run -->
<classpath refid="jcoverage"/>
</junit>
@@ -124,10 +124,10 @@
-->
<copy todir="${target.jcov.src}">
<mapper type="regexp" from=".*[\\/](org[\\/].*)" to="\1"/>
- <fileset dir="../jsword/${source.java}" casesensitive="yes">
+ <fileset dir="../jsword/${src.main.java.dir}" casesensitive="yes">
<patternset refid="java.compile"/>
</fileset>
- <fileset dir="../jsword/${source.java}" casesensitive="yes">
+ <fileset dir="../jsword/${src.main.java.dir}" casesensitive="yes">
<patternset refid="java.compile"/>
</fileset>
</copy>
Modified: trunk/jsword-support/tools/tomcat/build.xml
===================================================================
--- trunk/jsword-support/tools/tomcat/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-support/tools/tomcat/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -21,7 +21,7 @@
</target>
<target name="tomcat.install" description="Install a web application" depends="tomcatinit">
- <install url="${url}" username="${username}" password="${password}" path="${path}" war="file://$basedir}/${target.root}/web"/>
+ <install url="${url}" username="${username}" password="${password}" path="${path}" war="file://$basedir}/${dest.dir}/web"/>
</target>
<target name="tomcat.reload" description="Reload web application" depends="tomcatinit">
Modified: trunk/jsword-web/.classpath
===================================================================
--- trunk/jsword-web/.classpath 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-web/.classpath 2013-03-06 16:27:10 UTC (rev 2286)
@@ -6,6 +6,5 @@
<classpathentry kind="src" path="/bibledesktop"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-web/build.xml 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<project name="jsword-web" default="all">
- <property name="target.installed" value="../bibledesktop/target/installed"/>
+ <property name="dest.install.dir" value="../bibledesktop/target/installed"/>
<!-- override -->
<import file="../jsword/core.xml"/>
@@ -8,13 +8,13 @@
<property name="dependency" value="bibledesktop-web"/>
<!--=======================================================================-->
- <property name="source.web" value="${source.root}/main/webapp"/>
+ <property name="source.web" value="${src.dir}/main/webapp"/>
- <property name="webapp.jsword" value="${target.root}/webapp"/>
+ <property name="webapp.jsword" value="${dest.dir}/webapp"/>
<!-- override -->
<property name="jnlp.hostname" value="localhost:8080"/>
<!-- override -->
- <property name="ftp.base" value="${basedir}/${target.root}/download"/>
+ <property name="ftp.base" value="${basedir}/${dest.dir}/download"/>
<!-- override -->
<property name="ftp.prefix" value="../download"/>
<!-- override -->
@@ -25,13 +25,11 @@
<!--=======================================================================-->
<path id="path.alljava">
- <pathelement path="../common-swing/src/main/java"/>
<pathelement path="../jsword/src/main/java"/>
<pathelement path="../bibledesktop/src/main/java"/>
<pathelement path="../jsword-web/src/main/java"/>
</path>
<patternset id="pattern.alljava">
- <include name="common-swing/src/main/java/**/*.java"/>
<include name="jsword/src/main/java/**/*.java"/>
<include name="bibledesktop/src/main/java/**/*.java"/>
<include name="jsword-web/src/main/java/**/*.java"/>
@@ -40,18 +38,16 @@
<patternset refid="pattern.alljava"/>
</fileset>
<path id="path.allclasses">
- <pathelement path="../common-swing/${target.classes}"/>
- <pathelement path="../jsword/${target.classes}"/>
- <pathelement path="../bibledesktop/${target.classes}"/>
- <pathelement path="../jsword-web/${target.classes}"/>
+ <pathelement path="../common-swing/${dest.main.classes.dir}"/>
+ <pathelement path="../jsword/${dest.main.classes.dir}"/>
+ <pathelement path="../bibledesktop/${dest.main.classes.dir}"/>
+ <pathelement path="../jsword-web/${dest.main.classes.dir}"/>
</path>
<property name="support.tools" value="../jsword-support/tools"/>
<import file="${support.tools}/java2html/build.xml"/>
<import file="${support.tools}/javancss/build.xml"/>
<import file="${support.tools}/jcoverage/build.xml"/>
- <import file="${support.tools}/jdepend/build.xml"/>
- <import file="${support.tools}/pmd/build.xml"/>
<target name="findbugs" depends="build,findbugs.task">
<mkdir dir="${target.web}/findbugs"/>
@@ -66,7 +62,7 @@
<class location="${target.jar}/jsword-${release.version}.jar"/>
<class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
<sourcePath>
- <dirset dir=".." includes="**/${source.java}"/>
+ <dirset dir=".." includes="**/${src.main.java.dir}"/>
</sourcePath>
<auxClasspath>
<fileset dir="${target.jar}" includes="*.jar" />
@@ -77,8 +73,8 @@
<target name="checkstyle" depends="checkstyle.task">
<mkdir dir="${target.web}/checkstyle"/>
<checkstyle config="${checkstyle.config}" failOnViolation="${checkstyle.fail}">
- <property key="checkstyle.basedir" file="${source.java}" />
- <property key="checkstyle.cache.file" file="${target.root}/checkstyle.cache.dat" />
+ <property key="checkstyle.basedir" file="${src.main.java.dir}" />
+ <property key="checkstyle.cache.file" file="${dest.dir}/checkstyle.cache.dat" />
<fileset refid="fileset.alljava" />
<formatter type="plain" />
<formatter type="xml" toFile="${target.web}/checkstyle/checkstyle_errors.xml" />
@@ -95,8 +91,8 @@
<javadoc
sourcepathref="path.alljava"
packagenames="org.crosswire.*,gnu.gpl.*,gnu.lgpl.*"
- classpathref="runtime.jarpath"
- stylesheetfile="${source.etc}/javadoc/stylesheet.css"
+ classpathref="classpath.runtime"
+ stylesheetfile="${etc.dir}/javadoc/stylesheet.css"
destdir="${target.web}/api"
overview="../jsword/src/main/java/overview.html"
private="true"
@@ -106,13 +102,13 @@
version="true"
source="1.5"
failonerror="false">
- <footer>Copyright ¨ 2003-2011</footer>
- <link offline="true" href="http://download.oracle.com/javase/1.5.0/docs/api/" packagelistLoc="${source.etc}/javadoc"/>
+ <footer>Copyright ¨ 2003-2013</footer>
+ <link offline="true" href="http://download.oracle.com/javase/1.5.0/docs/api/" packagelistLoc="${etc.dir}/javadoc"/>
</javadoc>
</target>
<!--=======================================================================-->
- <target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/>
+ <target name="tools" depends="java2html,javancss"/>
<!--=======================================================================-->
<target name="install"
@@ -124,11 +120,11 @@
<target name="do.install"
depends="webapp, tools, release.nightly">
<!-- Create a flag file used to determine whether this task finished successfully -->
- <touch file="${target.root}/.flagfile"/>
+ <touch file="${dest.dir}/.flagfile"/>
</target>
<target name="install.check">
<uptodate property="release.uptodate"
- targetfile="${target.root}/.flagfile">
+ targetfile="${dest.dir}/.flagfile">
<srcfiles dir="${target.jar}" includes="*"/>
</uptodate>
<echo message="release.uptodate result: ${release.uptodate}"/>
@@ -216,7 +212,7 @@
<!--=======================================================================-->
<target name="release.version" depends="javadoc">
<echo message="Building release ${version} to ${directory}"/>
- <echo message="Target.installed is ${target.installed}"/>
+ <echo message="dest.install.dir is ${dest.install.dir}"/>
<!-- source packages -->
<mkdir dir="${directory}"/>
<zip zipfile="${directory}/jsword-${version}-src.zip">
@@ -237,10 +233,10 @@
</tar>
<!-- binary packages -->
<zip zipfile="${directory}/jsword-${version}-bin.zip">
- <zipfileset prefix="jsword-${version}" dir="${target.installed}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
+ <zipfileset prefix="jsword-${version}" dir="${dest.install.dir}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
</zip>
<tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
- <tarfileset prefix="jsword-${version}" dir="${target.installed}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
+ <tarfileset prefix="jsword-${version}" dir="${dest.install.dir}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
</tar>
<symlink link="${directory}/jsword-latest-bin.tar.gz"
resource="${directory}/jsword-${version}-bin.tar.gz"
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,8 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -12,9 +12,9 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2013-03-06 14:27:14 UTC (rev 2285)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2013-03-06 16:27:10 UTC (rev 2286)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,8 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
More information about the jsword-svn
mailing list