[jsword-svn] r1428 - in trunk: bibledesktop bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents bibledesktop/etc/jnlp common common/src/main/java/org/crosswire/common/util jsword-limbo/src/main/java/org/crosswire/common/util jsword-support/tools/findbugs jsword-web
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Fri Jun 22 10:34:40 MST 2007
Author: dmsmith
Date: 2007-06-22 10:34:40 -0700 (Fri, 22 Jun 2007)
New Revision: 1428
Modified:
trunk/bibledesktop/ReleaseInstructions.txt
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/common/core.xml
trunk/common/src/main/java/org/crosswire/common/util/Msg.java
trunk/common/src/main/java/org/crosswire/common/util/Msg.properties
trunk/common/src/main/java/org/crosswire/common/util/Msg_de.properties
trunk/common/src/main/java/org/crosswire/common/util/Reporter.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/util/ThreadUtil.java
trunk/jsword-support/tools/findbugs/build.xml
trunk/jsword-web/build.xml
Log:
release activity
Modified: trunk/bibledesktop/ReleaseInstructions.txt
===================================================================
--- trunk/bibledesktop/ReleaseInstructions.txt 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/bibledesktop/ReleaseInstructions.txt 2007-06-22 17:34:40 UTC (rev 1428)
@@ -16,10 +16,8 @@
Check in the changes for these 2 steps.
Step 3: Perform a clean build
-
Execute an ant build all in jsword-web. (jsword-web-ant-all in Eclipse)
Clean up all findbugs, pmd and checkstyle issues that make sense to do.
-(Currently there are 1 findbugs, 1 pmd and 2 checkstyle issues that can be ignored.)
Fix any javadoc issues.
Check in any files that changed.
Re-execute the ant if any files changed.
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/bibledesktop/build.xml 2007-06-22 17:34:40 UTC (rev 1428)
@@ -75,8 +75,8 @@
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="bibledesktop-${release.version}.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-${release.version}.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-swing-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-aqua-${release.version}.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-aqua-1.0.6.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-codec-1.3.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-httpclient-3.0.1.jar"/>
<jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-logging-1.1.jar"/>
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2007-06-22 17:34:40 UTC (rev 1428)
@@ -40,7 +40,7 @@
<string>$JAVAROOT/jsword- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common-swing- at release.version@.jar</string>
- <string>$JAVAROOT/jsword-common-aqua- at release.version@.jar</string>
+ <string>$JAVAROOT/jsword-common-aqua-1.0.6.jar</string>
<string>$JAVAROOT/lucene-core-2.2.0.jar</string>
<string>$JAVAROOT/jdom-1.0.jar</string>
<string>$JAVAROOT/commons-codec-1.3.jar</string>
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2007-06-22 17:34:40 UTC (rev 1428)
@@ -32,7 +32,7 @@
<jar href="jsword- at release.version@.jar"/>
<jar href="jsword-common- at release.version@.jar"/>
<jar href="jsword-common-swing- at release.version@.jar"/>
- <jar href="jsword-common-aqua- at release.version@.jar"/>
+ <jar href="jsword-common-aqua-1.0.6.jar"/>
<jar href="javatar-2.5.jar"/>
<jar href="jdom-1.0.jar"/>
<jar href="commons-codec-1.3.jar"/>
Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/common/core.xml 2007-06-22 17:34:40 UTC (rev 1428)
@@ -59,7 +59,7 @@
<include name="**/lucene-core-*.jar"/>
<include name="**/jlfgr-*.jar"/>
<include name="**/jsword-common-aqua-*.jar"/>
- <include name="**/javatar-*/*.jar"/>
+ <include name="**/javatar-*.jar"/>
<!--
<include name="**/activation.jar"/>
<include name="**/servlet.jar"/>
Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg.java 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg.java 2007-06-22 17:34:40 UTC (rev 1428)
@@ -43,7 +43,6 @@
static final Msg NOT_FILE_URI = new Msg("NetUtil.NotFileURI"); //$NON-NLS-1$
static final Msg NO_RESOURCE = new Msg("ResourceUtil.NoResource"); //$NON-NLS-1$
static final Msg NOT_ASSIGNABLE = new Msg("ResourceUtil.NotAssignable"); //$NON-NLS-1$
- static final Msg UNAVILABLE = new Msg("ThreadUtil.Unavailable"); //$NON-NLS-1$
static final Msg MISSING_FILE = new Msg("WebResource.MissingFile"); //$NON-NLS-1$
static final Msg UNEXPECTED_ERROR = new Msg("Reporter.Unexpected"); //$NON-NLS-1$
Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg.properties 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg.properties 2007-06-22 17:34:40 UTC (rev 1428)
@@ -17,6 +17,5 @@
NetUtil.NotFileURI=The given URL {0} is not a file: URL.
ResourceUtil.NoResource=Can''t find resource: {0}
ResourceUtil.NotAssignable=Class {0} does not implement {1}
-ThreadUtil.Unavailable=<Unavailable>
WebResource.MissingFile=Unable to find: {0}
-Reporter.Unexpected=Unexpected problem
\ No newline at end of file
+Reporter.Unexpected=Unexpected internal problem. You may need to restart.
\ No newline at end of file
Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg_de.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg_de.properties 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg_de.properties 2007-06-22 17:34:40 UTC (rev 1428)
@@ -17,5 +17,5 @@
NetUtil.NotFileURI=The given URL {0} is not a file: URL.
ResourceUtil.NoResource=Can''t find resource: {0}
ResourceUtil.NotAssignable=Class {0} does not implement {1}
-ThreadUtil.Unavailable=<Unavailable>
WebResource.MissingFile=Konnte nicht gefunden werden: {0}
+Reporter.Unexpected=Unexpected internal problem. You may need to restart.
\ No newline at end of file
Modified: trunk/common/src/main/java/org/crosswire/common/util/Reporter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Reporter.java 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/common/src/main/java/org/crosswire/common/util/Reporter.java 2007-06-22 17:34:40 UTC (rev 1428)
@@ -298,15 +298,16 @@
*/
public void handle(Throwable ex)
{
- // Only allow one to be reported.
- // TODO(DMS): change this to be once with in an interval.
- if (!handled)
+ // Only allow one to be reported every so often.
+ // This interval control was needed because AWT exceptions
+ // were causing recursive AWT exceptions
+ // and way too many dialogs were being thrown up on the screen.
+ if (gate.open())
{
- handled = true;
Reporter.informUser(this, new LucidException(Msg.UNEXPECTED_ERROR, ex));
}
}
- private static boolean handled;
+ private static TimeGate gate = new TimeGate(2000);
}
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/util/ThreadUtil.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/util/ThreadUtil.java 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/util/ThreadUtil.java 2007-06-22 17:34:40 UTC (rev 1428)
@@ -135,7 +135,7 @@
}
catch (SecurityException ex)
{
- addItem(list, depth, Msg.UNAVILABLE.toString());
+ addItem(list, depth, LimboMsg.UNAVILABLE.toString());
}
for (int i = 0; i < num_threads; i++)
@@ -173,7 +173,7 @@
}
catch (SecurityException ex)
{
- addItem(list, depth, Msg.UNAVILABLE.toString());
+ addItem(list, depth, LimboMsg.UNAVILABLE.toString());
}
}
Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/jsword-support/tools/findbugs/build.xml 2007-06-22 17:34:40 UTC (rev 1428)
@@ -6,9 +6,6 @@
<!-- this should be overridden by the parent file -->
<property name="support.tools" value=".."/>
- <!-- Unified location of source -->
- <property name="target.bugs.src" value="${target.temp}/findbugs/src"/>
-
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
<classpath>
<fileset dir="${support.bugs}/findbugs-${version.bugs}/lib" includes="**/*.jar"/>
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2007-06-22 16:24:58 UTC (rev 1427)
+++ trunk/jsword-web/build.xml 2007-06-22 17:34:40 UTC (rev 1428)
@@ -1,6 +1,9 @@
<project name="jsword-web" default="all">
+ <property name="target.installed" value="../bibledesktop/target/installed"/> <!-- override -->
+
<import file="../common/core.xml"/>
+
<property name="dependency" value="bibledesktop-web"/>
<property name="dependency.jar" value="../bibledesktop/${target.jar}"/>
@@ -11,7 +14,6 @@
<property name="jnlp.hostname" value="localhost:8080"/> <!-- override -->
<property name="ftp.base" value="${basedir}/${target.root}/download"/> <!-- override -->
<property name="ftp.prefix" value="../download"/> <!-- override -->
- <property name="target.installed" value="../bibledesktop/target/installed"/> <!-- override -->
<property name="nightly.dir" value="${ftp.base}/nightly"/>
<property name="release.dir" value="${ftp.base}/release"/>
@@ -81,7 +83,7 @@
version="true"
source="1.4"
failonerror="false">
- <footer>Copyright ¨ 2003-2006</footer>
+ <footer>Copyright ¨ 2003-2007</footer>
<link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${source.etc}/javadoc"/>
</javadoc>
</target>
@@ -170,6 +172,7 @@
<!--=======================================================================-->
<target name="release.version" depends="javadoc">
<echo message="Building release ${version} to ${directory}"/>
+ <echo message="Target.installed is ${target.installed}"/>
<!-- source packages -->
<mkdir dir="${directory}"/>
<zip zipfile="${directory}/jsword-${version}-src.zip">
More information about the jsword-svn
mailing list