[jsword-svn] r2270 - in trunk: bibledesktop bibledesktop/etc/eclipse bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents bibledesktop/etc/jnlp bibledesktop/src/main/java/org/crosswire/bibledesktop bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Feb 14 14:02:16 MST 2013
Author: dmsmith
Date: 2013-02-14 14:02:16 -0700 (Thu, 14 Feb 2013)
New Revision: 2270
Removed:
trunk/bibledesktop/etc/eclipse/localexec.bat
Modified:
trunk/bibledesktop/.project
trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch
trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
trunk/jsword-web/build.xml
Log:
JS-253 Fix the nightly build to use GIT for JSword
Cleanup nightly build and eclipse launch files.
Make the version 2.0beta
Modified: trunk/bibledesktop/.project
===================================================================
--- trunk/bibledesktop/.project 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/.project 2013-02-14 21:02:16 UTC (rev 2270)
@@ -16,5 +16,6 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
</projectDescription>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-02-14 21:02:16 UTC (rev 2270)
@@ -11,9 +11,12 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<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.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.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}"/>
<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-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2013-02-14 21:02:16 UTC (rev 2270)
@@ -11,9 +11,12 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<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.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.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}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk15.launch 2013-02-14 21:02:16 UTC (rev 2270)
@@ -21,7 +21,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="bibledesktop"/> </runtimeClasspathEntry> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.crosswire.bibledesktop.desktop.Desktop"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2013-02-14 21:02:16 UTC (rev 2270)
@@ -21,7 +21,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="bibledesktop"/> </runtimeClasspathEntry> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0"/>
+<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.crosswire.bibledesktop.desktop.Desktop"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
Deleted: trunk/bibledesktop/etc/eclipse/localexec.bat
===================================================================
--- trunk/bibledesktop/etc/eclipse/localexec.bat 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/eclipse/localexec.bat 2013-02-14 21:02:16 UTC (rev 2270)
@@ -1,34 +0,0 @@
-
-REM STEP 1 - Initial setup
-REM @echo off
-if "%OS%"=="Windows_NT" @setlocal
-
-REM STEP 2 - Check we know where we are installed
-set DEFAULT_JSWORD=%~dp0
-if "%JSWORD%"=="" set JSWORD=%DEFAULT_JSWORD%
-set DEFAULT_JSWORD=
-if exist "%JSWORD%" goto DoneFindJSword
-REM have a blind guess ...
-if not exist "C:\Progra~1\JSword" goto FailedFindJSword
-set JSWORD=C:\Progra~1\JSword
-:DoneFindJSword
-echo "Using JSWORD=%JSWORD%"
-
-REM STEP 3 - Setup the classpath
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%JSWORD%\*.jar") do call "%JSWORD%\lcp.bat" %%i
-
-REM STEP 4 - Run JSword
-REM -Xmx256M
-REM "-Djava.endorsed.dirs=%JSWORD%\lib"
-REM -classpath "%JSWORD%\resource"
-"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" org.crosswire.bibledesktop.desktop.Desktop
-goto End
-
-:FailedFindJSword
-echo "Can't find install directory. Please use C:\Progra~1\JSword or set the JSWORD variable"
-
-:End
-set LOCALCLASSPATH=
-set _JAVACMD=
-if "%OS%"=="Windows_NT" @endlocal
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2013-02-14 21:02:16 UTC (rev 2270)
@@ -33,7 +33,7 @@
<key>MainClass</key>
<string>org.crosswire.bibledesktop.desktop.Desktop</string>
<key>JVMVersion</key>
- <string>1.4+</string>
+ <string>1.5+</string>
<key>ClassPath</key>
<array>
<string>$JAVAROOT/bibledesktop- at release.version@.jar</string>
@@ -44,12 +44,12 @@
<string>$JAVAROOT/lucene-snowball-3.0.3.jar</string>
<string>$JAVAROOT/lucene-analyzers-3.0.3.jar</string>
<string>$JAVAROOT/lucene-smartcn-3.0.3.jar</string>
- <string>$JAVAROOT/jdom-1.1.1.jar</string>
- <string>$JAVAROOT/commons-codec-1.4.jar</string>
- <string>$JAVAROOT/httpcore-4.1.jar</string>
- <string>$JAVAROOT/httpclient-4.1-beta1.jar</string>
+ <string>$JAVAROOT/jdom-1.1.3.jar</string>
+ <string>$JAVAROOT/commons-codec-1.7.jar</string>
+ <string>$JAVAROOT/httpcore-4.2.3.jar</string>
+ <string>$JAVAROOT/httpclient-4.2.3.jar</string>
<string>$JAVAROOT/commons-logging-1.1.1.jar</string>
- <string>$JAVAROOT/commons-net-2.2.jar</string>
+ <string>$JAVAROOT/commons-net-3.2.jar</string>
<string>$JAVAROOT/javatar-2.5.jar</string>
<string>$JAVAROOT/jlfgr-1_0.jar</string>
</array>
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2013-02-14 21:02:16 UTC (rev 2270)
@@ -27,18 +27,18 @@
</security>
<resources>
- <j2se version="1.4+"/>
+ <j2se version="1.5+"/>
<jar href="bibledesktop- at release.version@.jar"/>
<jar href="jsword- at release.version@.jar"/>
<jar href="jsword-common-swing- at release.version@.jar"/>
<jar href="jsword-common-aqua-1.0.6.jar"/>
<jar href="javatar-2.5.jar"/>
- <jar href="jdom-1.1.1.jar"/>
- <jar href="commons-codec-1.4.jar"/>
- <jar href="httpcore-4.1.jar"/>
- <jar href="httpclient-4.1-beta1.jar"/>
+ <jar href="jdom-1.1.3.jar"/>
+ <jar href="commons-codec-1.7.jar"/>
+ <jar href="httpcore-4.2.3.jar"/>
+ <jar href="httpclient-4.2.3.jar"/>
<jar href="commons-logging-1.1.1.jar"/>
- <jar href="commons-net-2.2.jar"/>
+ <jar href="commons-net-3.2.jar"/>
<jar href="lucene-core-3.0.3.jar"/>
<jar href="lucene-snowball-3.0.3.jar"/>
<jar href="lucene-analyzers-3.0.3.jar"/>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2013-02-14 21:02:16 UTC (rev 2270)
@@ -99,7 +99,7 @@
* The current version of Bible Desktop. Adjust for each release.
* And increment after each release and append alpha, beta, ... to it.
*/
- private static final String VERSION = shaper.shape("1.6.1beta");
+ private static final String VERSION = shaper.shape("2.0beta");
private static MsgBase msg = new BDMsg();
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2013-02-14 21:02:16 UTC (rev 2270)
@@ -98,8 +98,7 @@
BASE_URL("baseURL", "", true),
/**
- * What is the base of the current document. Note this needs to be set each
- * time the document is shown.
+ * Is the dominant language direction LtoR or RtoL. Used to change layout order.
*/
DIRECTION("direction", ""),
@@ -112,9 +111,14 @@
/**
* What is the base of the current document.
*/
- CSS("css", "", true);
+ CSS("css", "", true),
/**
+ * What variant should be shown, default is "1".
+ */
+ VARIANT("Variant", "1");
+
+ /**
* @param name
* The name of this property
* @param defaultState
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-02-10 14:00:14 UTC (rev 2269)
+++ trunk/jsword-web/build.xml 2013-02-14 21:02:16 UTC (rev 2270)
@@ -48,10 +48,33 @@
<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}/findbugs/build.xml"/>
+ <!-- import file="${support.tools}/findbugs/build.xml"/ -->
<import file="${support.tools}/pmd/build.xml"/>
<!-- ignored <import file="${support.tools}/tomcat/build.xml"/> -->
+
+ <target name="findbugs">
+ <mkdir dir="${target.web}/findbugs"/>
+ <findbugs home="${findbugs.home}"
+ projectName="JSword/BibleDesktop"
+ output="html"
+ outputFile="${target.web}/findbugs/index.html"
+ reportLevel="low"
+ workHard="true"
+ jvmargs="-Xmx512m">
+ <class location="${target.jar}/bibledesktop-${release.version}.jar"/>
+ <class location="${target.jar}/jsword-${release.version}.jar"/>
+ <class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
+ <sourcePath>
+ <dirset dir=".." includes="**/${source.java}"/>
+ </sourcePath>
+ <auxClasspath>
+ <fileset dir="${target.jar}" includes="*.jar" />
+ </auxClasspath>
+ </findbugs>
+ </target>
+
+
<target name="javadoc" description="Create JavaDoc">
<!-- This is not incremental. Empty it so it can remove unused docs. -->
<delete dir="${target.web}/api"/>
More information about the jsword-svn
mailing list