[jsword-svn] r1070 - in trunk: bibledesktop
bibledesktop/etc/eclipse bibledesktop/etc/installer
bibledesktop/etc/jnlp
bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop
bibledesktop/src/main/java/org/crosswire/bibledesktop/display
bibledesktop-web/etc/eclipse bibledesktop-web/src/web
bibledesktop-web/src/web/stable common common/etc/eclipse
common/src/main/java/org/crosswire/common/xml jsword
jsword/etc/eclipse jsword/jar jsword/jar/lucene-1.9.1
jsword/src/main/java/org/crosswire/jsword/examples
jsword-support/tools/findbugs jsword-web/etc/eclipse
jsword-web/src/web
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Apr 9 06:46:25 MST 2006
Author: dmsmith
Date: 2006-04-09 06:42:05 -0700 (Sun, 09 Apr 2006)
New Revision: 1070
Added:
trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi
trunk/jsword/jar/lucene-1.9.1/
trunk/jsword/jar/lucene-1.9.1/LICENSE.txt
trunk/jsword/jar/lucene-1.9.1/README.txt
trunk/jsword/jar/lucene-1.9.1/lucene-1.9.1-src.zip
trunk/jsword/jar/lucene-1.9.1/lucene-core-1.9.1.jar
Removed:
trunk/bibledesktop/etc/installer/setup.nsi
trunk/jsword/jar/lucene-1.9-final/
Modified:
trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
trunk/bibledesktop-web/src/web/download.html
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/eclipse/bibledesktop-ant-all.launch
trunk/bibledesktop/etc/eclipse/bibledesktop-ant-incremental.launch
trunk/bibledesktop/etc/eclipse/bibledesktop-ant-install.launch
trunk/bibledesktop/etc/installer/BibleDesktop.exe
trunk/bibledesktop/etc/installer/BibleDesktop.nsi
trunk/bibledesktop/etc/installer/BibleDesktopSetup.exe
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package.html
trunk/common/core.xml
trunk/common/etc/eclipse/common-ant-all.launch
trunk/common/etc/eclipse/common-ant-build.launch
trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java
trunk/jsword-support/tools/findbugs/build.xml
trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
trunk/jsword-web/src/web/Eclipse.html
trunk/jsword-web/src/web/change.html
trunk/jsword-web/src/web/devt.html
trunk/jsword-web/src/web/news.html
trunk/jsword-web/src/web/svn.html
trunk/jsword/.classpath
trunk/jsword/etc/eclipse/jsword-ant-all.launch
trunk/jsword/etc/eclipse/jsword-ant-build.launch
trunk/jsword/etc/eclipse/jsword-ant-clean.launch
trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
Log:
preparing for 1.0.2 release
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/build.xml 2006-04-09 13:42:05 UTC (rev 1070)
@@ -44,7 +44,7 @@
<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"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jlfgr-1_0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="lucene-core-1.9-final.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="lucene-core-1.9.1.jar"/>
<!--
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="blogapps-1.0.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="gnu-regexp-1.1.4.jar"/>
@@ -96,12 +96,10 @@
and *.sh startup files.
-->
<mkdir dir="${jnlp.installed}"/>
- <copy todir="${jnlp.installed}"
+ <copy file="${jnlp.uninstalled}/bibledesktop.jnlp"
+ tofile="${jnlp.installed}/bibledesktop-${release.version}.jnlp"
filtering="true"
preservelastmodified="true">
- <fileset dir="${jnlp.uninstalled}">
- <include name="**/*.jnlp"/>
- </fileset>
<filterset>
<filter token="jnlp.homepage" value="${jnlp.homepage}"/>
<filter token="jnlp.codebase" value="${jnlp.codebase}"/>
Modified: trunk/bibledesktop/etc/eclipse/bibledesktop-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/bibledesktop-ant-all.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/eclipse/bibledesktop-ant-all.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
Modified: trunk/bibledesktop/etc/eclipse/bibledesktop-ant-incremental.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/bibledesktop-ant-incremental.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/eclipse/bibledesktop-ant-incremental.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
</launchConfiguration>
Modified: trunk/bibledesktop/etc/eclipse/bibledesktop-ant-install.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/bibledesktop-ant-install.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/eclipse/bibledesktop-ant-install.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
Modified: trunk/bibledesktop/etc/installer/BibleDesktop.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop/etc/installer/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/BibleDesktop.nsi 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/installer/BibleDesktop.nsi 2006-04-09 13:42:05 UTC (rev 1070)
@@ -8,8 +8,9 @@
!define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
!define JAVALIB "$EXEDIR"
-!define JRE_VERSION "1.5.0"
-!define JRE_URL "http://dlc.sun.com/jdk/jre-1_5_0_01-windows-i586-p.exe"
+!define JRE_VERSION "1.4.2"
+!define JRE_URL "http://dlc.sun.com/jdk/j2re-1_4_2_07-windows-i586-p.exe"
+;!define JRE_URL "http://nsis.sourceforge.net/mediawiki/images/b/b4/InetLoad.zip"
SetCompressor lzma
@@ -34,12 +35,12 @@
StrCpy $0 '"$R0" -classpath "$R1" ${CLASS}'
-;ClearErrors
-;FileOpen $1 $EXEDIR\java.log w
-;IfErrors done
-;FileWrite $1 $0
-;FileClose $1
-;done:
+ClearErrors
+FileOpen $1 $EXEDIR\java.log w
+IfErrors done
+FileWrite $1 $0
+FileClose $1
+done:
SetOutPath $EXEDIR
Exec $0
@@ -89,21 +90,58 @@
FunctionEnd
Function GetJRE
- MessageBox MB_OK "$(^NAME) uses Java ${JRE_VERSION} or later, it will now be downloaded and installed."
+ MessageBox MB_OK "BibleDesktop uses Java ${JRE_VERSION} or later, it will now be downloaded and installed."
StrCpy $2 "$TEMP\Java Runtime Environment.exe"
InetLoad::load /POPUP "Getting Java for ${PRODUCT_NAME}" ${JRE_URL} $2
Pop $R0 ;Get the return value
- StrCmp $R0 "OK" +3
+ StrCmp $R0 "OK" +5
;NSISdl::download /TIMEOUT=30000 ${JRE_URL} $2
;Pop $R0 ;Get the return value
- ;StrCmp $R0 "success" +3
- MessageBox MB_OK "Download failed: $R0"
+ ;StrCmp $R0 "success" +5
+ MessageBox MB_OK "Could not install Java for you. Please install Java from http://www.java.com then re-run BibleDesktop."
+ StrCpy $0 "http://www.java.com"
+ Call openLinkNewWindow
Quit
ExecWait $2
Delete $2
FunctionEnd
+# uses $0
+Function openLinkNewWindow
+ Push $3
+ Push $2
+ Push $1
+ Push $0
+ ReadRegStr $0 HKCR "http\shell\open\command" ""
+# Get browser path
+ DetailPrint $0
+ StrCpy $2 '"'
+ StrCpy $1 $0 1
+ StrCmp $1 $2 +2 # if path is not enclosed in " look for space as final char
+ StrCpy $2 ' '
+ StrCpy $3 1
+ loop:
+ StrCpy $1 $0 1 $3
+ DetailPrint $1
+ StrCmp $1 $2 found
+ StrCmp $1 "" found
+ IntOp $3 $3 + 1
+ Goto loop
+
+ found:
+ StrCpy $1 $0 $3
+ StrCmp $2 " " +2
+ StrCpy $1 '$1"'
+
+ Pop $0
+ Exec '$1 $0'
+ Pop $1
+ Pop $2
+ Pop $3
+FunctionEnd
+
+
Function DetectJRE
; Put "Yes" or "No" on the stack
@@ -165,4 +203,4 @@
; restore state and put results in R0
Exch $R0
-FunctionEnd
\ No newline at end of file
+FunctionEnd
Modified: trunk/bibledesktop/etc/installer/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Copied: trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi (from rev 1018, trunk/bibledesktop/etc/installer/setup.nsi)
===================================================================
--- trunk/bibledesktop/etc/installer/setup.nsi 2006-03-01 17:10:01 UTC (rev 1018)
+++ trunk/bibledesktop/etc/installer/BibleDesktopSetup.nsi 2006-04-09 13:42:05 UTC (rev 1070)
@@ -0,0 +1,100 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "BibleDesktop"
+!define PRODUCT_VERSION "1.0.2"
+!define PRODUCT_PUBLISHER "Crosswire Bible Society"
+!define PRODUCT_WEB_SITE "http://www.crosswire.org/bibledesktop/index.html"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "${PRODUCT_NAME}.ico"
+!define MUI_UNICON "${PRODUCT_NAME}.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "gpl.txt"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_NAME}.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; Reserve files
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "${PRODUCT_NAME}Setup.exe"
+InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Section "MainSection" SEC01
+ SetOutPath "$INSTDIR"
+ SetOverwrite ifnewer
+ File "${PRODUCT_NAME}.exe"
+ CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
+ CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
+ ; use the unsigned jars
+ File ..\..\target\uninstalled\*.jar
+SectionEnd
+
+Section -AdditionalIcons
+ WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} on the Web.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+ WriteUninstaller "$INSTDIR\uninst.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_NAME}.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME}.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+ HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Function un.onInit
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+ Abort
+FunctionEnd
+
+Section Uninstall
+ Delete /REBOOTOK "$DESKTOP\${PRODUCT_NAME}.lnk"
+
+ RMDir /r /REBOOTOK "$SMPROGRAMS\${PRODUCT_NAME}"
+ RMDir /r /REBOOTOK $INSTDIR
+
+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+ SetAutoClose true
+SectionEnd
\ No newline at end of file
Deleted: trunk/bibledesktop/etc/installer/setup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/setup.nsi 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/installer/setup.nsi 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,99 +0,0 @@
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0"
-!define PRODUCT_PUBLISHER "Crosswire Bible Society"
-!define PRODUCT_WEB_SITE "http://www.crosswire.org/bibledesktop/index.html"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "${PRODUCT_NAME}.ico"
-!define MUI_UNICON "${PRODUCT_NAME}.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "gpl.txt"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_NAME}.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; Reserve files
-!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME}Setup.exe"
-InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Section "MainSection" SEC01
- SetOutPath "$INSTDIR"
- SetOverwrite ifnewer
- File "${PRODUCT_NAME}.exe"
- CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
- CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
- File ..\..\target\installed\*.jar
-SectionEnd
-
-Section -AdditionalIcons
- WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} on the Web.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
- WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_NAME}.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME}.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-SectionEnd
-
-
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-
-Function un.onInit
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
- Abort
-FunctionEnd
-
-Section Uninstall
- Delete /REBOOTOK "$DESKTOP\${PRODUCT_NAME}.lnk"
-
- RMDir /r /REBOOTOK "$SMPROGRAMS\${PRODUCT_NAME}"
- RMDir /r /REBOOTOK $INSTDIR
-
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
- SetAutoClose true
-SectionEnd
\ No newline at end of file
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 1.0//EN" "jnlp.dtd">
-<jnlp spec="1.0+" codebase="@jnlp.codebase@" href="bibledesktop.jnlp">
+<jnlp spec="1.0+" codebase="@jnlp.codebase@" href="bibledesktop- at release.version@.jnlp">
<information>
- <title>Bible Desktop</title>
+ <title>Bible Desktop v. at release.version@</title>
<vendor>Crosswire Bible Society</vendor>
<homepage href="@jnlp.homepage@"/>
<description>Bible Desktop - Bible Study Software based on the Sword project</description>
@@ -36,18 +36,8 @@
<jar href="commons-httpclient-3.0.jar"/>
<jar href="commons-logging.jar"/>
<jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-core-1.9-final.jar"/>
+ <jar href="lucene-core-1.9.1.jar"/>
<jar href="jlfgr-1_0.jar"/>
- <!--
- <jar href="xmlrpc-2.0.1.jar"/>
- <jar href="rome-0.7.jar"/>
- <jar href="werx-051405.jar"/>
- <jar href="blogapps-1.0.jar"/>
- <jar href="gnu-regexp-1.1.4.jar"/>
- <jar href="kafenio-config-0.8.5.jar"/>
- <jar href="kafenio-icons-0.8.5.jar"/>
- <jar href="kafenio-0.8.5.jar"/>
- -->
<property name="apple.laf.useScreenMenuBar" value="true"/>
<property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
</resources>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties 2006-04-09 13:42:05 UTC (rev 1070)
@@ -8,7 +8,7 @@
# Property describing the name and version of the program
Desktop.Title=Bible Desktop
Desktop.Splash=Bible Desktop
-Desktop.Version=1.0.1
+Desktop.Version=1.0.2
Desktop.VersionTitle=Version {0}
Desktop.VersionAppTitle={0} v{1}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package.html
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -7,28 +7,31 @@
objects.
</p>
-<p>
+<br/>
There are several implementation of this interface in sub-packages.
-<li>textpane - A simple unscrolled implementation that uses a JDK HTML widget.
+<ul>
+<li>textpane - A simple unscrolled implementation that uses a JDK HTML widget.</li>
<li>proxy - A handy base class to simplify adding features to another
- implementation of BookDataDisplay
+ implementation of BookDataDisplay</li>
<li>scrolled - Builds on proxy to scroll child BookDataDisplays. Generally the
- child will be a textpane implementation.
+ child will be a textpane implementation.</li>
<li>tab - Splits a display into a number of tabs so arbitarily large pasasges
- can be viewed without scrolling or memory problems.
+ can be viewed without scrolling or memory problems.</li>
<li>splitlist - presents the parts of a passage as a list from which individual
- keys can be selected for viewing.
-</p>
+ keys can be selected for viewing.</li>
+</ul>
-<p>
+
+<br/>
We have spent some time investigating alternatives to the JDK HTML widget.
The requirements were:
-<li>work using OSIS input
-<li>be easily understood for the developer (which fairly much means HTML)
-<li>work over webstart
-<li>be freely re-distributable
-<li>allow some DHTML like flexibility
-</p>
+<ul>
+<li>work using OSIS input</li>
+<li>be easily understood for the developer (which fairly much means HTML)</li>
+<li>work over webstart</li>
+<li>be freely re-distributable</li>
+<li>allow some DHTML like flexibility</li>
+</ul>
<p>
<b>JRex (Embed Mozilla)</b><br/>
@@ -67,7 +70,7 @@
</p>
<p>
-<b>FOP -> PNG</b><br/>
+<b>FOP -> PNG</b><br/>
FOP is XSL:FO renderer that can create PDFs and various graphics files.
Could give very slick output, but not at all dynamic, quite slow and FO is not
easy to use. Probably not one of the best ideas for normal rendering.
@@ -76,7 +79,7 @@
<p>
<b>Dynamic Swing GUI</b><br/>
-There are plenty of XML->Swing converters. JDK 1.4 even includes one.
+There are plenty of XML->Swing converters. JDK 1.4 even includes one.
Maybe we could write a OSIS->SwingXML converter in XSL and then render OSIS
text in swing components. Could be very fancy. XSL could be complex.
</p>
Modified: trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
===================================================================
--- trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop-web/build.xml}"/>
</launchConfiguration>
Modified: trunk/bibledesktop-web/src/web/download.html
===================================================================
--- trunk/bibledesktop-web/src/web/download.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop-web/src/web/download.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -9,7 +9,7 @@
<h1>Official Stable Release</h1>
<p>
- The latest official release of Bible Desktop is 1.0. We provide you a choice of running
+ The latest official release of Bible Desktop is 1.0.2. We provide you a choice of running
BibleDesktop using WebStart or a standard installer.
</p>
<h2>WebStart</h2>
@@ -22,7 +22,7 @@
easier. You won't need to come back to this page.
</p>
<div align="center">
- <a href="stable/bibledesktop.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
+ <a href="stable/bibledesktop-1.0.2.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
</div>
<br/>
<h2>Standard Installers</h2>
@@ -42,7 +42,7 @@
You'll need an installation of Java as for the stable release of Bible Desktop.
</p>
<div align="center">
- <a href="nightly/bibledesktop.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
+ <a href="nightly/bibledesktop-1.0.2.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
</div>
<h1>Note on Linux</h1>
@@ -57,14 +57,14 @@
<h1>Binary Downloads</h1>
<p>
If you wish to download Bible Desktop without an installer and to run in the conventional manner, it is
- available in the following formats. The links below are all for version 1.0,
+ available in the following formats. The links below are all for version 1.0.2,
(but <a href="/ftpmirror/pub/jsword/release">this link</a> has older versions
for what they are worth):
</p>
<ul>
- <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0-bin.zip">For Windows there is a .zip file.</a></li>
- <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.dmg.gz">For MacOS-X there is a .dmg.gz file. (TBD)</a></li>
- <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0-bin.tar.gz">For Linux/Unix there is a .tar.gz file.</a></li>
+ <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.2-bin.zip">For Windows there is a .zip file.</a></li>
+ <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.2.dmg.gz">For MacOS-X there is a .dmg.gz file. (TBD)</a></li>
+ <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.2-bin.tar.gz">For Linux/Unix there is a .tar.gz file.</a></li>
</ul>
<h1>Sword Modules</h1>
Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 1.0//EN" "jnlp.dtd">
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop.jnlp">
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.2.jnlp">
<information>
<title>Bible Desktop</title>
@@ -26,17 +26,17 @@
<resources>
<j2se version="1.4+" max-heap-size="512m"/>
- <jar href="bibledesktop-1.0.jar"/>
- <jar href="jsword-1.0.jar"/>
- <jar href="jsword-common-1.0.jar"/>
- <jar href="jsword-common-swing-1.0.jar"/>
+ <jar href="bibledesktop-1.0.2.jar"/>
+ <jar href="jsword-1.0.2.jar"/>
+ <jar href="jsword-common-1.0.2.jar"/>
+ <jar href="jsword-common-swing-1.0.2.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.jar"/>
<jar href="commons-logging.jar"/>
<jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-core-1.9-final.jar"/>
+ <jar href="lucene-core-1.9.1.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"/>
Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/common/core.xml 2006-04-09 13:42:05 UTC (rev 1070)
@@ -10,7 +10,7 @@
== These are the standard locations that this build file uses.
== This assumes that the build file is in the root of the project.
=========================================================================-->
- <property name="release.version" value="1.0.1"/>
+ <property name="release.version" value="1.0.2"/>
<property name="source.root" value="src"/>
<property name="source.etc" value="etc"/>
<property name="source.jar" value="jar"/>
Modified: trunk/common/etc/eclipse/common-ant-all.launch
===================================================================
--- trunk/common/etc/eclipse/common-ant-all.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/common/etc/eclipse/common-ant-all.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="common"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
Modified: trunk/common/etc/eclipse/common-ant-build.launch
===================================================================
--- trunk/common/etc/eclipse/common-ant-build.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/common/etc/eclipse/common-ant-build.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="common"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/common/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/common}"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="build"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="build,"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="common"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/common/build.xml}"/>
</launchConfiguration>
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java 2006-04-09 13:42:05 UTC (rev 1070)
@@ -32,7 +32,7 @@
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class XMLFeature implements Serializable
+public class XMLFeature implements Serializable, Comparable
{
/** Namespaces feature id */
public static final XMLFeature NAMESPACES = new XMLFeature("http://xml.org/sax/features/namespaces"); //$NON-NLS-1$
@@ -158,6 +158,15 @@
return (state ? "on " : "off ") + control; //$NON-NLS-1$ //$NON-NLS-2$
}
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(Object o)
+ {
+ XMLFeature feature = (XMLFeature) o;
+ return this.control.compareTo(feature.control);
+ }
+
private String control;
private boolean state;
/**
Modified: trunk/jsword/.classpath
===================================================================
--- trunk/jsword/.classpath 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/.classpath 2006-04-09 13:42:05 UTC (rev 1070)
@@ -4,6 +4,6 @@
<classpathentry exported="true" kind="src" path="/common"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry exported="true" sourcepath="jar/lucene-1.9-final/lucene-1.9-final-src.zip" kind="lib" path="jar/lucene-1.9-final/lucene-core-1.9-final.jar"/>
+ <classpathentry exported="true" kind="lib" path="jar/lucene-1.9.1/lucene-core-1.9.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/jsword/etc/eclipse/jsword-ant-all.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-all.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/etc/eclipse/jsword-ant-all.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
Modified: trunk/jsword/etc/eclipse/jsword-ant-build.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-build.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/etc/eclipse/jsword-ant-build.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/jsword}"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="build"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="build,"/>
</launchConfiguration>
Modified: trunk/jsword/etc/eclipse/jsword-ant-clean.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-clean.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/etc/eclipse/jsword-ant-clean.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
Added: trunk/jsword/jar/lucene-1.9.1/LICENSE.txt
===================================================================
--- trunk/jsword/jar/lucene-1.9.1/LICENSE.txt 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/jar/lucene-1.9.1/LICENSE.txt 2006-04-09 13:42:05 UTC (rev 1070)
@@ -0,0 +1,15 @@
+/**
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
Added: trunk/jsword/jar/lucene-1.9.1/README.txt
===================================================================
--- trunk/jsword/jar/lucene-1.9.1/README.txt 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/jar/lucene-1.9.1/README.txt 2006-04-09 13:42:05 UTC (rev 1070)
@@ -0,0 +1,43 @@
+Lucene README file
+
+$Id: README.txt 381429 2006-02-27 20:17:01Z cutting $
+
+INTRODUCTION
+
+Lucene is a Java full-text search engine. Lucene is not a complete
+application, but rather a code library and API that can easily be used
+to add search capabilities to applications.
+
+The Lucene web site is at:
+ http://lucene.apache.org/
+
+Please join the Lucene-User mailing list by sending a message to:
+ java-user-subscribe at lucene.apache.org
+
+FILES
+
+lucene-core-XX.jar
+ The compiled lucene library.
+
+lucene-demos-XX.jar
+ The compiled simple example code.
+
+luceneweb.war
+ The compiled simple example Web Application.
+
+contrib/*
+ Contributed code which extends and enhances Lucene, but is not
+ part of the core library.
+
+docs/index.html
+ The contents of the Lucene website.
+
+docs/api/index.html
+ The Javadoc Lucene API documentation. This includes the core
+ library, the demo, as well as all of the contrib modules.
+
+src/java
+ The Lucene source code.
+
+src/demo
+ Some example code.
Added: trunk/jsword/jar/lucene-1.9.1/lucene-1.9.1-src.zip
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-1.9.1/lucene-1.9.1-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsword/jar/lucene-1.9.1/lucene-core-1.9.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-1.9.1/lucene-core-1.9.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-04-09 13:42:05 UTC (rev 1070)
@@ -2537,8 +2537,8 @@
input = input.replaceAll("\\bMahanehdan\\b", "Mahaneh\u2013dan"); //$NON-NLS-1$ //$NON-NLS-2$
if (input.indexOf("Mahershalalhashbaz") != -1) //$NON-NLS-1$
input = input.replaceAll("\\bMahershalalhashbaz\\b", "Maher\u2013shalal\u2013hash\u2013baz"); //$NON-NLS-1$ //$NON-NLS-2$
- if (input.indexOf("Maher–shalal–hash–baz") != -1) //$NON-NLS-1$
- input = input.replaceAll("\\bMaher–shalal–hash–baz\\b", "Maher\u2013shalal\u2013hash\u2013baz"); //$NON-NLS-1$ //$NON-NLS-2$
+ if (input.indexOf("Maher-shalal-hash-baz") != -1) //$NON-NLS-1$
+ input = input.replaceAll("\\bMaher-shalal-hash-baz\\b", "Maher\u2013shalal\u2013hash\u2013baz"); //$NON-NLS-1$ //$NON-NLS-2$
if (input.indexOf("Malchishua") != -1) //$NON-NLS-1$
input = input.replaceAll("\\bMalchishua\\b", "Malchi\u2013shua"); //$NON-NLS-1$ //$NON-NLS-2$
if (input.indexOf("Mejarkon") != -1) //$NON-NLS-1$
Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-support/tools/findbugs/build.xml 2006-04-09 13:42:05 UTC (rev 1070)
@@ -31,7 +31,7 @@
<auxClasspath path="${target.jar}/commons-httpclient-3.0.jar"/>
<auxClasspath path="${target.jar}/javatar-2.5.jar"/>
<auxClasspath path="${target.jar}/jdom-1.0.jar"/>
- <auxClasspath path="${target.jar}/lucene-core-1.9-final.jar"/>
+ <auxClasspath path="${target.jar}/lucene-core-1.9.1.jar"/>
<auxClasspath path="../common/jar/jaf-1.0.2/activation.jar"/>
<auxClasspath path="${target.jar}/jlfgr-1_0.jar"/>
<auxClasspath path="${target.jar}/blogapps-1.0.jar"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<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"/>
<intAttribute key="org.eclipse.ui.externaltoolsATTR_SORT_TARGETS" value="1"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="tools,"/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
</launchConfiguration>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
</launchConfiguration>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2006-04-09 13:42:05 UTC (rev 1070)
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<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.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.4.2"/>
+<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
</launchConfiguration>
Modified: trunk/jsword-web/src/web/Eclipse.html
===================================================================
--- trunk/jsword-web/src/web/Eclipse.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/src/web/Eclipse.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -24,7 +24,7 @@
<p>
To develop JSword with Eclipse, you will need to tell it to use
Sun's Java 1.4.2. We recommend using the most recent point release
- which at the time of this writing was 1.4.2_08. You can get Sun's Java
+ which at the time of this writing was 1.4.2_11. You can get Sun's Java
<a href="http://java.sun.com/j2se/1.4.2/download.html">here</a>.
You can find instructions on installing Sun's Java for Linux under
<a name="linuxjava" href="linuxjava.html">Installing Java under Fedora Core 3/4</a>.
@@ -42,17 +42,14 @@
the Gnome desktop.
</p>
<p>
- You can get Eclipse for Windows from here:
+ You can get Eclipse for Windows, Linux and Mac from here:
<a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a>.
- The download will be about 90M, so it is best to have a broadband connection.
- With Windows, you will only have one choice. If you are running linux, you will
+ The download will be about 100M, so it is best to have a broadband connection.
+ With Windows and Mac, you will only have one choice. If you are running linux, you will
have a choice between Motif and GTK versions and if you are running Fedora Core 4,
- Eclipse is provided in the distribution as a native GTK build. The screenshots are from the GTK version.
+ Eclipse is provided in the distribution as a native GTK build.
+ The screenshots are from the GTK version.
</p>
-<p>
- You can istall Eclipse for Fedora Core 3/4 as an rpm from here:
- <a href="http://www.eclipse.org/downloads">http://www.eclipse.org/downloads</a>.
-</p>
<h2>Installing Eclipse</h2>
<p>
@@ -134,51 +131,33 @@
<a href="images/eclipse/firstrun.png">[Image]</a>
</p>
-<h3>Connect to JSword's CVS repository</h3>
-<strong><em>
- After we release JSword and BibleDesktop version 1.0,
- we will be migrating to SVN
-</em></strong>
+<h3>Connect to JSword's SVN repository</h3>
+<p>Add the subclipse plugin from <a href="http://subclipse.tigris.org">http://subclipse.tigris.org</a>.
+ Instructions are on that website.
+</p>
<p>
- Add the CVS Respository Exploring perspective.
+ Add the SVN Respository Exploring perspective.
<a href="images/eclipse/repositoryperspective.png">[Image]</a>
</p>
<ul>
- <li>This will automatically open the CVS Repository Exploring perspective.</li>
- <li>Click on the <q>Add CVS Repository</q> button.</li>
- <li>Fill in the dialog with the following values:
- <table>
- <tr>
- <td><strong>Host:</strong></td>
- <td>cvs.crosswire.org</td>
- </tr>
- <tr>
- <td><strong>Repository Path:</strong></td>
- <td>/cvs/jsword</td>
- </tr>
- <tr>
- <td><strong>User:</strong></td>
- <td>anonymous</td>
- </tr>
- <tr>
- <td><strong>Password:</strong></td>
- <td>anonymous</td>
- </tr>
- <tr>
- <td colspan="2">Click on <q>Save Password</q> as it is no secret!</td>
- </tr>
- <tr>
- <td colspan="2">Click on <q>Finish</q></td>
- </tr>
- </table>
+ <li>This will automatically open the SVN Repository Exploring perspective.</li>
+ <li>Click on the <q>Add SVN Repository</q> button.</li>
+ <li>For the URL use the value: https://www.crosswire.org/svn/jsword/trunk.<br/>
This will provide you with read-only access to the repository.
To change the code you will submit patches which is explained below.
</li>
- <li>Open the repository and expand HEAD.</li>
- <li>Right click on bibledesktop, choose <q>Check Out As...</q>
+ <li>Open the repository, expanding https://www.crosswire.org/svn/jsword/trunk.</li>
+ <li>Select at a minimum the following:
+ <ul>
+ <li>bibledesktop</li>
+ <li>common</li>
+ <li>common-swing</li>
+ <li>jsword</li>
+ </ul>
+ </li>
+ <li>Right click on one of the selection and choose <q>Checkout...</q>
and then click <q>Finish</q>.</li>
- <li>Repeat this for common, jsword and jsword-support.
- Later you may wish to do help maintain the website and then you will
+ <li>Later you may wish to do help maintain the website and then you will
want bibledesktop-web and jsword-web.</li>
<li>You don't need this perspective for day to day development,
so you can remove it.</li>
Modified: trunk/jsword-web/src/web/change.html
===================================================================
--- trunk/jsword-web/src/web/change.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/src/web/change.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -13,6 +13,14 @@
<p>The following is the broad outline of the version of JSword,
BibleDesktop and Project-B (the old name for JSword).</p>
<ul>
+ <li><strong>Version 1.0.2</strong> - SECOND UPDATE -
+ Our apologies to our Mac users, since only the most recent version of the Mac OS has Java 5.0.
+ This release no longer requires Java 5.0, but rather 1.4 or higher.
+ This release also changes the internal JSword API, merging VerseBase into Key and using an iterator rather than an array as a collection of verses.
+ </li>
+ <li><strong>Version 1.0.1</strong> - FIRST UPDATE -
+ This release provides a few bug fixes and requires Java 5.0.
+ </li>
<li><strong>Version 1.0</strong> - FIRST FULL RELEASE -
Since the last release we have been working on small
bugs and features to make BibleDesktop more useable.
Modified: trunk/jsword-web/src/web/devt.html
===================================================================
--- trunk/jsword-web/src/web/devt.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/src/web/devt.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -48,7 +48,12 @@
<h2>Quality Checks</h2>
<p>
- The nightly builds also run some freely available code quality checkers. The tools we use are: <a href="http://checkstyle.sourceforge.net">CheckStyle</a>, <a href="http://pmd.sourceforge.net">PMD</a>, <a href="http://www.cs.umd.edu/~pugh/java/bugs">FindBugs</a>, <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://www.kclee.de/clemens/java/javancss">NCSS</a>.
+ The nightly builds also run some freely available code quality checkers. The tools we use are:
+ <a href="http://checkstyle.sourceforge.net">CheckStyle</a>,
+ <a href="http://pmd.sourceforge.net">PMD</a>,
+ <a href="http://findbugs.sourceforge.net">FindBugs</a>,
+ <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and
+ <a href="http://www.kclee.de/clemens/java/javancss">NCSS</a>.
These reports check many details of the source including that coding standards are being followed, that we are avoiding
common traps and that we are not falling fowl of more obscure bugs.
</p>
@@ -56,7 +61,7 @@
<ul>
<li><a href="checkstyle">Coding Standards report</a> generated by <a href="http://checkstyle.sourceforge.net">CheckStyle</a>.</li>
<li><a href="http://pmd.sourceforge.net">PMD</a> reports <a href="pmd">common bugs</a> and <a href="cpd/report.txt">needlessly copied code</a>.</li>
- <li><a href="findbugs">Bug report analysis</a> courtesy of <a href="http://www.cs.umd.edu/~pugh/java/bugs">FindBugs</a>.</li>
+ <li><a href="findbugs">Bug report analysis</a> courtesy of <a href="http://findbugs.sourceforge.net">FindBugs</a>.</li>
<li><a href="jdepend/jdepend-report.html">Dependency analysis</a> generated by <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a>.</li>
<li><a href="javancss">Non-comment source code</a> report from <a href="http://www.kclee.de/clemens/java/javancss">NCSS</a>.</li>
</ul>
Modified: trunk/jsword-web/src/web/news.html
===================================================================
--- trunk/jsword-web/src/web/news.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/src/web/news.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -9,9 +9,15 @@
<h1>News</h1>
-<h3>16 Jan 2006</h3>
-<p>We have migrated our Source Code Management from CVS to SVN.</p>
+<h3>8 Apr 2006</h3>
+<p>BibleDesktop 1.0.2 is been released.
+The previous release inadvertently kept BibleDesktop from running on Mac OS 10.3 and earlier.
+This release fixes that by no longer requiring Java 5.0.</p>
+<h3>1 Mar 2006</h3>
+<p>BibleDesktop 1.0.1 is released, providing a few bug fixes and performance enhancements.</p>
+<p>This release also requires Java 5.0</p>
+
<h3>6 Jan 2006</h3>
<p>BibleDesktop 1.0 has been released!!! While it has been a long time since our last release, we
have been active. Since the last release we have been working on small
@@ -21,6 +27,9 @@
Over the next week or so we will be updating the documentation on the website to match
the release.</p>
+<h3>16 Jan 2006</h3>
+<p>We have migrated our Source Code Management from CVS to SVN.</p>
+
<h3>25 Mar 2005</h3>
<p>JSword and BibleDesktop 0.9.9 have been released. The user experience has been
greatly improved. Many options on viewing passages have been added to the view menu.
Modified: trunk/jsword-web/src/web/svn.html
===================================================================
--- trunk/jsword-web/src/web/svn.html 2006-04-08 14:39:10 UTC (rev 1069)
+++ trunk/jsword-web/src/web/svn.html 2006-04-09 13:42:05 UTC (rev 1070)
@@ -13,14 +13,14 @@
<p>
Our source code is managed with Subversion, aka SVN. SVN is hosted at crosswire. The SVN root is:<br />
<code>https://crosswire.org/svn/jsword</code><br />
- And the password is "anonymous". If you need to get at the code but are not
- sure about SVN then join the mailing list and we'll sort something out. The
- module to checkout is 'jsword', so if you are using the command line you would
+ Anyone can access the code without a password and can be browsed at this url.<br/>
+ The project to checkout is <code>jsword</code>, so if you are using the command line you would
do something like this<br />
<code>svn checkout https://crosswire.org/svn/jsword/trunk/jsword jsword</code>.<br />
- There is also a support module containing 3rd-party source jars, tools to
- build the website, UML models and a default KJV module. To get access to this
- you will need to check-out <code>jsword-support</code>.
+ You will need to repeat this for each of bibledesktop, common and common-swing.
+ There is also <code>jsword-support</code>, containing 3rd-party QA tools<br/>
+ <code>jsword-web</code> contains the code for the JSword website and
+ bibledesktop-web houses the website for BibleDesktop.
</p>
<p>
For detailed instruction on how to use Eclipse as a SVN client see:
More information about the jsword-svn
mailing list