[jsword-svn] r2042 - in trunk/jsword-web: . src/main/webapp
dmsmith at crosswire.org
dmsmith at crosswire.org
Mon Dec 6 07:05:04 MST 2010
Author: dmsmith
Date: 2010-12-06 07:05:04 -0700 (Mon, 06 Dec 2010)
New Revision: 2042
Modified:
trunk/jsword-web/
trunk/jsword-web/src/main/webapp/Eclipse.html
trunk/jsword-web/src/main/webapp/future.html
trunk/jsword-web/src/main/webapp/linuxjava.html
trunk/jsword-web/src/main/webapp/svn.html
trunk/jsword-web/src/main/webapp/writingcode.html
Log:
JS-136: Require Java 5 means removing references in the jsword website to Java 1.4.2.
Property changes on: trunk/jsword-web
___________________________________________________________________
Modified: svn:ignore
- target
bin
+ target
bin
lib
Modified: trunk/jsword-web/src/main/webapp/Eclipse.html
===================================================================
--- trunk/jsword-web/src/main/webapp/Eclipse.html 2010-12-05 13:44:56 UTC (rev 2041)
+++ trunk/jsword-web/src/main/webapp/Eclipse.html 2010-12-06 14:05:04 UTC (rev 2042)
@@ -20,35 +20,12 @@
or once you have Eclipse set up, make the changes and send us a patch.
</p>
-<h2>Obtain and install Sun's Java 1.4.2_x</h2>
-<p>
- To develop JSword and BibleDesktop Java code with Eclipse, you will need to tell it to use
- Sun's Java 1.4.2. You will need to get the J2SE SDK.
- We recommend using the most recent point release
- which at the time of this writing was <q>J2SE v1.4.2_15 SDK</q>.
- You can get Sun's Java 1.4.2
- <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 href="linuxjava.html">Installing Java for Linux</a>.
-</p>
-<p>
- If possible set an environment variable, <code>JAVA_HOME</code> to point to
- the directory you just created. This might be something like <code>C:\Java\j2sdk1.4.2_15</code>.
-</p>
<h2>Obtain and install Sun's Java 1.5 (aka Java 5)</h2>
<p>
- We develop under Java 1.4.2, but routinely test against Java 5. We will move to Java 5
- when it is well supported on all the platforms to which we deploy. Currently
- these are Windows, Mac and Linux. At this time MacOS 10.3 does not support Java 5
- and probably will not. (Soon enough we will start testing with Java 6)
-</p>
-<p>
<strong>NOTE:</strong>BibleDesktop looks best in Java 5 or later and for
- <em>right-to-left</em> languages it is a necessity. For this reason,
- it is strongly recommended that the builds are done with Java 1.4.2,
- but that running is done with Java 1.5 or better. If you are not changing
- java code, but only working on translations, you only need to install Java 1.5.0 SDK.
+ <em>right-to-left</em> languages it is a necessity. If you are not changing
+ java code, but only working on translations, you only need to install Java 1.5.0 SDK or later.
</p>
<p>
We recommend using the most recent point release
@@ -58,6 +35,10 @@
Again, you can find instructions on installing Sun's Java for Linux under
<a href="linuxjava.html">Installing Java for Linux</a>.
</p>
+<p>
+ If possible set an environment variable, <code>JAVA_HOME</code> to point to
+ the directory you just created. This might be something like <code>C:\Java\j2sdk1.5.0_b22</code>.
+</p>
<h2>Obtain and install Eclipse 3.3</h2>
<p>
@@ -165,9 +146,8 @@
<p>
Under Windows -> Preferences (on the Mac it is Eclipse -> Preferences),
expand <q>Java</q> and then select <q>Installed JRE</q>. <a href="images/eclipse/javasetup.png">[Image]</a>
- Here click on the <q>Add</q> button and add entries labelled,
- jdk-1.4.2 <a href="images/eclipse/jdk142setup.png">[Image]</a> and jdk-1.5.0 <a href="images/eclipse/jdk150setup.png">[Image]</a>. Under Linux, installed according to the instructions above,
- Java 1.4.2 would have a path something like <code>/usr/lib/jvm/java-1.4.2-sun-1.4.2.12</code>.
+ Here click on the <q>Add</q> button and add an entry labelled jdk-1.5.0 <a href="images/eclipse/jdk150setup.png">[Image]</a>. Under Linux, installed according to the instructions above,
+ Java 1.5.0 would have a path something like <code>/usr/lib/jvm/java-1.5.0-sun-1.5.0.12</code>.
You can use the search button to find them and re-label them afterwards.
Make sure that you have <q>assertions</q> turned on for development by adding <q>-ea</q> for the <q>Default VM Args</q>.
When you are all done it should look like this. <a href="images/eclipse/javafinalsetup.png">[Image]</a>
Modified: trunk/jsword-web/src/main/webapp/future.html
===================================================================
--- trunk/jsword-web/src/main/webapp/future.html 2010-12-05 13:44:56 UTC (rev 2041)
+++ trunk/jsword-web/src/main/webapp/future.html 2010-12-06 14:05:04 UTC (rev 2042)
@@ -50,11 +50,11 @@
Some architectural changes:
<ol>
<li>A framework which would make it easy for others to develop optional capabilities that can be easily discovered, imported, used and, if not needed, discarded. Ultimately, a core download should be pretty small and feature light.<br/>
- (It would have been great if Don could have used such a framework for the Journaling capabilities he provided.)</li>
+ </li>
<li>Rendering using a modern browser.</li>
<li>An ability to work directly with OSIS files.</li>
<li>A lightweight core API that can be used on mobile devices such as phones and PDAs. (We may have this already)</li>
-<li>Able to use any 1.4.2 Java runtime, with GJC being a specific target. The goal is to be fully open source. Currently we are reliant on closed source java.</li>
+<li>Able to use any 1.5.0 Java runtime, with GJC being a specific target. The goal is to be fully open source. Currently we are reliant on closed source java.</li>
<li>Use 3rd party code as a replacement. E.g. preferences, plugins, ....</li>
</ol>
Modified: trunk/jsword-web/src/main/webapp/linuxjava.html
===================================================================
--- trunk/jsword-web/src/main/webapp/linuxjava.html 2010-12-05 13:44:56 UTC (rev 2041)
+++ trunk/jsword-web/src/main/webapp/linuxjava.html 2010-12-06 14:05:04 UTC (rev 2042)
@@ -10,22 +10,20 @@
<h1>Obtain and Install Java for Linux</h1>
<p>
The situation regarding Java is changing fast. Sun has opened sourced Java, but not all of it,
- nor all versions of it (Sun's Java 1.4.2 and 1.5.0 are still proprietary and not open source).
+ nor all versions of it (Sun's Java 1.5.0 is still proprietary and not open source).
Some Linux distributions now have a version of Sun's java that will run BibleDesktop. Please note
- that the gcj version of Java is not able to run BibleDesktop as it does not implement all of Java 1.4.2.
+ that the gcj version of Java is not able to run BibleDesktop as it does not implement all of Java 1.5.0.
Even this is anticipated to change.
</p>
<p>
If your distribution does not provide Java then get Sun's Java. If you are just running BibleDesktop,
then get the most recent release. If you are going to help develop BibleDesktop or JSword, we target
- Java 1.4.2. If you are careful not to use features added after 1.4.2 you can use a more
+ Java 1.5.0. If you are careful not to use features added after 1.5.0 you can use a more
recent version. Once you obtain Sun's Java you need to install it. However, Sun's Java RPM
does not install correctly. To install it correctly you will need to use JPackage's Java Package.
</p>
<p>
- The following steps will allow you to install Sun's Java correctly. Below is how to install Java 1.5
- but the same can be done for Java 1.4.2. At this time, if you need to install Java 1.4.2, you may need
- to install 1.5 first.
+ The following steps will allow you to install Sun's Java correctly. Below is how to install Java 1.5.
</p>
<ol>
<li>With these steps you will be building a RPM. So, if you have not already done so, install rpm-build.
Modified: trunk/jsword-web/src/main/webapp/svn.html
===================================================================
--- trunk/jsword-web/src/main/webapp/svn.html 2010-12-05 13:44:56 UTC (rev 2041)
+++ trunk/jsword-web/src/main/webapp/svn.html 2010-12-06 14:05:04 UTC (rev 2042)
@@ -18,18 +18,22 @@
</p>
<p>We have broken up JSword into subprojects. These are:</p>
<ol>
- <li><strong>common</strong> - A set of base, general purpose, common utilities.</li>
- <li><strong>jsword</strong> - This is the core Sword api. The basic provisions of this project are:
- <ul>
- <li>Read Sword modules, extracting passages as requested.</li>
- <li>Convert passages in Sword Modules into OSIS.</li>
- <li>Run xslt on OSIS.</li>
- <li>Build Lucene indexes for a Sword Modules.</li>
- <li>and ....</li>
- </ul>
+ <li><strong>jsword</strong> - Consists of two parts:
+ <ul>
+ <li><em>org.crosswire.common</em> - This is a base, general purpose set of common utilities</li>
+ <li><em>org.crosswire.jsword</em> - the core Sword api. Its basic provisions are:
+ <ul>
+ <li>Read Sword modules, extracting passages as requested.</li>
+ <li>Convert passages in Sword Modules into OSIS.</li>
+ <li>Run xslt on OSIS.</li>
+ <li>Build Lucene indexes for a Sword Modules.</li>
+ <li>and ....</li>
+ </ul>
+ </li>
+ </ul>
</li>
- <li><strong>common-swing</strong> - Like common but specific to swing.</li>
- <li><strong>bibledesktop</strong> - The GUI that exposes JSword functionality.</li>
+ <li><strong>common-swing</strong> - Like org.crosswire.common but specific to swing.</li>
+ <li><strong>bibledesktop</strong> - A GUI that exposes JSword functionality.</li>
<li><strong>jsword-web</strong> - The code and html for the <a href="/jsword">JSword website</a>. This project also contains the ant build.xml file that is used for nightly builds.</li>
<li><strong>bibledesktop-web</strong> - The code and html for the <a href="/bibledesktop">BibleDesktop website</a>.</li>
<li><strong>jsword-support</strong> - Quality Assurance tools that we use before checking in code and that we run nightly.</li>
@@ -37,7 +41,7 @@
<li><strong>biblemapper</strong> - Provides an analytical view of a Bible. Currently this is not used.</li>
<li><strong>javatar</strong> - 3rd party code that we could not use directly via Java WebStart. It is here only to build a jar that works with WebStart</li>
</ol>
-<p>To get started you will need the first two projects, and to do BibleDesktop development you also need the next two projects.
+<p>To get started you will need the first project, and to do BibleDesktop development you also need the next two projects.
For each of the projects you wish to use, cd to the directory you wish to check out and then do a SVN checkout following this form:<br/>
The project to checkout is <code>jsword</code>, so if you are using the command line you would
<code>svn checkout https://crosswire.org/svn/jsword/trunk/jsword jsword</code>.<br />
Modified: trunk/jsword-web/src/main/webapp/writingcode.html
===================================================================
--- trunk/jsword-web/src/main/webapp/writingcode.html 2010-12-05 13:44:56 UTC (rev 2041)
+++ trunk/jsword-web/src/main/webapp/writingcode.html 2010-12-06 14:05:04 UTC (rev 2042)
@@ -81,11 +81,9 @@
the "lowest common denominator" of the JDK.
</p>
<p>
- This is all currently being written using JDK 1.4.2. The basis for this is that
+ This is all currently being written using JDK 5. The basis for this is that
(where practical) we will retain support for JDKs where some of our users have
- no better options. So at the time of writing Mac OS X Panther supports JDK1.4.2, we
- have people wanting to use JSword on MacOS, so when we want to use JDK1.5 only
- features we'll use reflection or some other trick to remain compatible with JDK1.4.
+ no better options.
</p>
<h3>Coding Standards</h3>
More information about the jsword-svn
mailing list