[jsword-svn] r1104 - in trunk: bibledesktop bibledesktop/etc/installer bibledesktop/etc/jnlp bibledesktop-web/src/web bibledesktop-web/src/web/stable jsword-support/tools/findbugs
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Jul 23 18:43:51 MST 2006
Author: dmsmith
Date: 2006-07-23 18:40:56 -0700 (Sun, 23 Jul 2006)
New Revision: 1104
Added:
trunk/bibledesktop-web/src/web/stable/
trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat
trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp
trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
trunk/bibledesktop-web/src/web/stable/icon132.gif
trunk/bibledesktop-web/src/web/stable/icon16.gif
trunk/bibledesktop-web/src/web/stable/icon32.gif
trunk/bibledesktop-web/src/web/stable/icon64.gif
trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
trunk/bibledesktop-web/src/web/stable/jsword-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/lcp.bat
trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
Modified:
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/installer/BibleDesktopSetup.exe
trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/jsword-support/tools/findbugs/build.xml
Log:
more 1.0.3 release changes
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop/build.xml 2006-07-24 01:40:56 UTC (rev 1104)
@@ -38,8 +38,8 @@
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-swing-${release.version}.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-${release.version}.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-codec-1.3.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-httpclient-3.0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-logging.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-httpclient-3.0.1.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-logging-1.1.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-net-1.4.1.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jdom-1.0.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="javatar-2.5.jar"/>
Modified: trunk/bibledesktop/etc/installer/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi 2006-07-24 01:40:56 UTC (rev 1104)
@@ -44,7 +44,7 @@
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${PRODUCT_NAME}Setup.exe"
-InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+InstallDir "$PROGRAMFILES\CrossWire\${PRODUCT_NAME}"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show
@@ -56,6 +56,8 @@
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
+ ; remove all previous jars
+ Delete /REBOOTOK $INSTDIR\*.jar
; use the unsigned jars
File ..\..\target\uninstalled\*.jar
SectionEnd
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-07-24 01:40:56 UTC (rev 1104)
@@ -35,8 +35,8 @@
<jar href="javatar-2.5.jar"/>
<jar href="jdom-1.0.jar"/>
<jar href="commons-codec-1.3.jar"/>
- <jar href="commons-httpclient-3.0.jar"/>
- <jar href="commons-logging.jar"/>
+ <jar href="commons-httpclient-3.0.1.jar"/>
+ <jar href="commons-logging-1.1.jar"/>
<jar href="commons-net-1.4.1.jar"/>
<jar href="lucene-core-2.0.0.jar"/>
<jar href="jlfgr-1_0.jar"/>
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat
===================================================================
--- trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat 2006-07-24 01:40:56 UTC (rev 1104)
@@ -0,0 +1,34 @@
+
+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
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
===================================================================
--- trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh 2006-07-24 01:40:56 UTC (rev 1104)
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Parts of this file were derived from the ant startup script for unix.
+# Copyright (c) 2001-2003 The Apache Software Foundation.
+
+# 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 "$JSWORD" ] ; then
+ ## resolve links - $0 may be a link to jsword's home
+ PRG="$0"
+ progname=`basename "$0"`
+ saveddir=`pwd`
+
+ # need this for relative symlinks
+ dirname_prg=`dirname "$PRG"`
+ cd "$dirname_prg"
+
+ 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
+
+ JSWORD=`dirname "$PRG"`
+
+ cd "$saveddir"
+
+ # make it fully qualified
+ JSWORD=`cd "$JSWORD" && pwd`
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JSWORD" ] &&
+ JSWORD=`cygpath --unix "$JSWORD"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/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
+
+if [ -n "$CLASSPATH" ] ; then
+ LOCALCLASSPATH="$CLASSPATH"
+fi
+
+# This is redundant if we are using the endorsed.dirs method
+for i in "${JSWORD}/"*.jar
+do
+ # if the directory is empty, then it will return the input string
+ # this is stupid, so case for it
+ if [ -f "$i" ] ; then
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH="$i"
+ else
+ LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
+ fi
+ fi
+done
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JSWORD=`cygpath --windows "$JSWORD"`
+ JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+ CYGHOME=`cygpath --windows "$HOME"`
+fi
+
+# "-Djava.endorsed.dirs=${JSWORD}/lib"
+# -classpath "${JSWORD}/resource"
+"$JAVACMD" -classpath "${LOCALCLASSPATH}" org.crosswire.bibledesktop.desktop.Desktop
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp 2006-07-24 01:40:56 UTC (rev 1104)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.3.jnlp">
+
+ <information>
+ <title>Bible Desktop v.1.0.3</title>
+ <vendor>Crosswire Bible Society</vendor>
+ <homepage href="http://www.crosswire.org/bibledesktop"/>
+ <description>Bible Desktop - Bible Study Software based on the Sword project</description>
+ <description kind="short">Bible Desktop is a Bible study package available over the internet</description>
+ <description kind="tooltip">Bible Desktop Application</description>
+ <icon href="icon32.gif"/>
+ <icon kind="splash" href="icon64.gif"/>
+ <offline-allowed/>
+ <shortcut online="false">
+ <desktop/>
+ <menu submenu="Bible Desktop"/>
+ </shortcut>
+ </information>
+
+ <security>
+ <!--
+ We need disk io to read installed Sword Bibles,
+ network access to install new ones, and the ability to read system vars
+ I'm not sure there is much point in asking for less that everything
+ -->
+ <all-permissions/>
+ </security>
+
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="bibledesktop-1.0.3.jar"/>
+ <jar href="jsword-1.0.3.jar"/>
+ <jar href="jsword-common-1.0.3.jar"/>
+ <jar href="jsword-common-swing-1.0.3.jar"/>
+ <jar href="javatar-2.5.jar"/>
+ <jar href="jdom-1.0.jar"/>
+ <jar href="commons-codec-1.3.jar"/>
+ <jar href="commons-httpclient-3.0.1.jar"/>
+ <jar href="commons-logging-1.1.jar"/>
+ <jar href="commons-net-1.4.1.jar"/>
+ <jar href="lucene-core-2.0.0.jar"/>
+ <jar href="jlfgr-1_0.jar"/>
+ <property name="apple.laf.useScreenMenuBar" value="true"/>
+ <property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
+ </resources>
+
+ <application-desc main-class="org.crosswire.bibledesktop.desktop.Desktop"/>
+
+</jnlp>
Added: trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/icon132.gif
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/icon132.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/icon16.gif
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/icon16.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/icon32.gif
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/icon32.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/icon64.gif
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/icon64.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/jsword-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/lcp.bat
===================================================================
--- trunk/bibledesktop-web/src/web/stable/lcp.bat 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/bibledesktop-web/src/web/stable/lcp.bat 2006-07-24 01:40:56 UTC (rev 1104)
@@ -0,0 +1,16 @@
+REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+REM reserved.
+
+set _CLASSPATHCOMPONENT=%1
+if ""%1""=="""" goto gotAllArgs
+shift
+
+:argCheck
+if ""%1""=="""" goto gotAllArgs
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+shift
+goto argCheck
+
+:gotAllArgs
+set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+
Added: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml 2006-07-24 00:33:00 UTC (rev 1103)
+++ trunk/jsword-support/tools/findbugs/build.xml 2006-07-24 01:40:56 UTC (rev 1104)
@@ -29,6 +29,8 @@
<class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
<auxClasspath path="${target.jar}/commons-net-1.4.1.jar"/>
<auxClasspath path="${target.jar}/commons-httpclient-3.0.1.jar"/>
+ <auxClasspath path="${target.jar}/commons-codec-1.3.jar"/>
+ <auxClasspath path="${target.jar}/commons-logging-1.1.jar"/>
<auxClasspath path="${target.jar}/javatar-2.5.jar"/>
<auxClasspath path="${target.jar}/jdom-1.0.jar"/>
<auxClasspath path="${target.jar}/lucene-core-2.0.0.jar"/>
More information about the jsword-svn
mailing list