[jsword-svn] r1268 - trunk/bibledesktop-web/src/web/stable

dmsmith at www.crosswire.org dmsmith at www.crosswire.org
Fri Mar 30 14:12:25 MST 2007


Author: dmsmith
Date: 2007-03-30 14:12:25 -0700 (Fri, 30 Mar 2007)
New Revision: 1268

Added:
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jar
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp
   trunk/bibledesktop-web/src/web/stable/jsword-1.0.6.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.6.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.6.jar
   trunk/bibledesktop-web/src/web/stable/lucene-core-2.1.0.jar
Removed:
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp
   trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
Modified:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
   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/javatar-2.5.jar
   trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
   trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
Log:
Preparing the stable release for 1.0.6

Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
===================================================================
--- trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh	2007-03-30 20:36:46 UTC (rev 1267)
+++ trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh	2007-03-30 21:12:25 UTC (rev 1268)
@@ -15,7 +15,7 @@
            ;;
 esac
 
-if [ -z "$JSWORD" ] ; then
+if [ -z "$JSWORD_HOME" ] ; then
   ## resolve links - $0 may be a link to jsword's home
   PRG="$0"
   progname=`basename "$0"`
@@ -29,26 +29,29 @@
     ls=`ls -ld "$PRG"`
     link=`expr "$ls" : '.*-> \(.*\)$'`
     if expr "$link" : '.*/.*' > /dev/null; then
-	PRG="$link"
+      PRG="$link"
     else
-	PRG=`dirname "$PRG"`"/$link"
+      PRG=`dirname "$PRG"`"/$link"
     fi
   done
 
-  JSWORD=`dirname "$PRG"`
+  JSWORD_HOME=`dirname "$PRG"`
 
   cd "$saveddir"
 
   # make it fully qualified
-  JSWORD=`cd "$JSWORD" && pwd`
+  JSWORD_HOME=`cd "$JSWORD_HOME" && pwd`
 fi
 
-cd $JSWORD
+cd $JSWORD_HOME
 
+# Root contains Java directory with JREs, modules and mods.d
+ROOT=`dirname $JSWORD_HOME`
+
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$JSWORD" ] &&
-    JSWORD=`cygpath --unix "$JSWORD"`
+  [ -n "$JSWORD_HOME" ] &&
+    JSWORD_HOME=`cygpath --unix "$JSWORD_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
@@ -64,9 +67,12 @@
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java 2> /dev/null `
+    JAVACMD=`ls -d $ROOT/Java/linux/jre*/bin/java 2> /dev/null`
     if [ -z "$JAVACMD" ] ; then 
+      JAVACMD=`which java 2> /dev/null `
+      if [ -z "$JAVACMD" ] ; then 
         JAVACMD=java
+      fi
     fi
   fi
 fi
@@ -81,8 +87,14 @@
   LOCALCLASSPATH="$CLASSPATH"
 fi
 
+# define the location of the jar files
+JSWORD_LIB="$JSWORD_HOME"
+if [ -e "${JSWORD_LIB}/lib" ] ; then
+  JSWORD_LIB=$JSWORD_HOME
+fi
+
 # This is redundant if we are using the endorsed.dirs method
-for i in "${JSWORD}/"*.jar
+for i in "${JSWORD_LIB}"/*.jar
 do
   # if the directory is empty, then it will return the input string
   # this is stupid, so case for it
@@ -97,13 +109,19 @@
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
-  JSWORD=`cygpath --windows "$JSWORD"`
+  JSWORD_HOME=`cygpath --windows "$JSWORD_HOME"`
   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
+# "-Djava.endorsed.dirs=${JSWORD_LIB}"
+# -classpath "${JSWORD_HOME}/resource"
+# Note: We always pass the "apple" arguments, even when not on a mac.
+JSWORD_PROPERTIES=-Dapple.laf.useScreenMenuBar=true
+JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Dcom.apple.mrj.application.apple.menu.about.name=BibleDesktop"
+[ -e "$JSWORD_HOME/JSword" ] && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Djsword.home=$JSWORD_HOME/JSword"
+[ -e "$ROOT/mods.d" ]        && JSWORD_PROPERTIES="$JSWORD_PROPERTIES -Dsword.home=$ROOT"
+
+"$JAVACMD" -classpath "${LOCALCLASSPATH}" $JSWORD_PROPERTIES org.crosswire.bibledesktop.desktop.Desktop

Deleted: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
===================================================================
(Binary files differ)

Deleted: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp	2007-03-30 20:36:46 UTC (rev 1267)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.5.jnlp">
-
-  <information>
-    <title>Bible Desktop v.1.0.5</title>
-    <vendor>Crosswire Bible Society</vendor>
-    <homepage href="http://www.crosswire.org/bibledesktop/stable"/>
-    <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.5.jar"/>
-    <jar href="jsword-1.0.5.jar"/>
-    <jar href="jsword-common-1.0.5.jar"/>
-    <jar href="jsword-common-swing-1.0.5.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/bibledesktop-1.0.6.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp	                        (rev 0)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6.jnlp">
+
+  <information>
+    <title>Bible Desktop v.1.0.6</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.6.jar"/>
+    <jar href="jsword-1.0.6.jar"/>
+    <jar href="jsword-common-1.0.6.jar"/>
+    <jar href="jsword-common-swing-1.0.6.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.1.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/bibledesktop-1.0.6_de.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp	                        (rev 0)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6_de.jnlp">
+
+  <information>
+    <title>Bible Desktop v.1.0.6</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.6.jar"/>
+    <jar href="jsword-1.0.6.jar"/>
+    <jar href="jsword-common-1.0.6.jar"/>
+    <jar href="jsword-common-swing-1.0.6.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.1.0.jar"/>
+    <jar href="jlfgr-1_0.jar"/>
+    <property name="user.language" value="de"/>
+    <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/bibledesktop-1.0.6_fa.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp	                        (rev 0)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6_fa.jnlp">
+
+  <information>
+    <title>Bible Desktop v.1.0.6</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.6.jar"/>
+    <jar href="jsword-1.0.6.jar"/>
+    <jar href="jsword-common-1.0.6.jar"/>
+    <jar href="jsword-common-swing-1.0.6.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.1.0.jar"/>
+    <jar href="jlfgr-1_0.jar"/>
+    <property name="user.language" value="fa"/>
+    <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>

Modified: trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
===================================================================
(Binary files differ)

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-1.0.6.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-1.0.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.6.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.6.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/lucene-core-2.1.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/lucene-core-2.1.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jsword-svn mailing list