summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-10-28 04:11:32 (EDT)
committer Glyn Normington2010-11-02 08:20:52 (EDT)
commit8fc74e849ef0dc423e504fbabcbd0bc49478c2cd (patch)
tree3f0627c1baecea9f43f06fc457b756aa20da5ea0
parent6a02d6b39d02b14096677bbfe3a74343c9ca0b24 (diff)
downloadorg.eclipse.virgo.documentation-8fc74e849ef0dc423e504fbabcbd0bc49478c2cd.zip
org.eclipse.virgo.documentation-8fc74e849ef0dc423e504fbabcbd0bc49478c2cd.tar.gz
org.eclipse.virgo.documentation-8fc74e849ef0dc423e504fbabcbd0bc49478c2cd.tar.bz2
Reset STS to 2.5.0.RELEASE; and remove 'you' from the text.
-rw-r--r--getting-started/filters.properties2
-rw-r--r--getting-started/src/automated-build.xml8
-rw-r--r--getting-started/src/installing-greenpages.xml12
-rw-r--r--getting-started/src/installing.xml12
-rw-r--r--getting-started/src/testing-greenpages.xml8
-rw-r--r--getting-started/src/web-module/deploy-bundle.xml3
-rw-r--r--getting-started/src/web-module/osgi-reference.xml4
7 files changed, 24 insertions, 25 deletions
diff --git a/getting-started/filters.properties b/getting-started/filters.properties
index ceedb71..baa4c62 100644
--- a/getting-started/filters.properties
+++ b/getting-started/filters.properties
@@ -16,7 +16,7 @@ webserv.zip.file=virgo-web-server-@webserv.version@.zip
sts=SpringSource Tool Suite
sts.short=STS
sts.version.number=2.5.0
-sts.version=@sts.version.number@.RC1
+sts.version=@sts.version.number@.RELEASE
sts.eclipse.base.version=e3.6.1
sts.zip.file.windows=springsource-tool-suite-@sts.version@-@sts.eclipse.base.version@-win32.zip
#sts.zip.file.unix=springsource-tool-suite-@sts.version@-@sts.eclipse.base.version@-linux-gtk.tar.gz
diff --git a/getting-started/src/automated-build.xml b/getting-started/src/automated-build.xml
index 8542794..e1c730b 100644
--- a/getting-started/src/automated-build.xml
+++ b/getting-started/src/automated-build.xml
@@ -119,7 +119,7 @@
<para>
This skeleton defines a basic configuration with a parent POM. Notice that the <literal>packaging</literal>
- type is <literal>par</literal>. When you have created this file execute the following command from the
+ type is <literal>par</literal>. After this file is created execute the following command from the
<filename>$GREENPAGES_HOME/start/greenpages</filename> directory.
<programlisting>mvn clean package</programlisting>
</para>
@@ -213,7 +213,7 @@
<section id="automated.build.dependency.plugin">
<title>Adding the <literal>dependency</literal> plugin</title>
<para>
- Maven now successfully builds the PAR for your application, however the dependencies of the PAR
+ Maven now successfully builds the PAR for the application, however the dependencies of the PAR
are not apparent.
In this step the Maven <literal>dependency</literal> plugin is added to
collect the transitive dependency graph for the PAR.
@@ -350,9 +350,9 @@
</para>
<para>
- Start the @webserv@. You should see output similar to:
+ Start the @webserv@ and look for a message similar to:
<programlisting><![CDATA[<DE0005I> Started par 'greenpages' version '@app.version@'.]]>
-</programlisting>
+</programlisting>in the console output.
</para>
<para>
diff --git a/getting-started/src/installing-greenpages.xml b/getting-started/src/installing-greenpages.xml
index 8c7dc2d..2adc8c3 100644
--- a/getting-started/src/installing-greenpages.xml
+++ b/getting-started/src/installing-greenpages.xml
@@ -166,7 +166,7 @@ prompt$ cp target/par-provided/* $VWS_HOME/repository/usr
<section id="installing.greenpages.building.db">
<title>Starting and configuring the database</title>
-<para>@greenpages@ uses the H2 database to store all its data. Before you can start the application, you must start the database server and populate the database with data.</para>
+<para>@greenpages@ uses the H2 database to store all its data. Before starting the application, start the database server and populate the database with data.</para>
<orderedlist>
<listitem><para>Change to the <code>$GREENPAGES_HOME/db</code> current directory. On Unix:</para>
<programlisting>prompt$ cd $GREENPAGES_HOME/db</programlisting>
@@ -188,7 +188,7 @@ prompt$ cp target/par-provided/* $VWS_HOME/repository/usr
</orderedlist>
<para>
-You only to need run these commands once to start a database server for H2; the server will continue to run in the background.
+Run these commands once to start a database server for H2; the server will continue to run in the background.
</para>
</section>
@@ -277,7 +277,7 @@ prompt> copy %GREENPAGES_HOME%\solution\greenpages\target\greenpages-solution-@a
<section id="installing.greenpages.tools.importing">
<title>Importing the @greenpages@ projects into Eclipse</title>
<para>
- Before you can start the @greenpages@ application from Eclipse, you must import the projects. To import the projects into Eclipse:
+ Before starting the @greenpages@ application from Eclipse, import the projects:
<orderedlist>
<listitem>
<para>Open the Import Wizard using
@@ -420,8 +420,8 @@ It is safe to ignore these.
<section id="installing.greenpages.tools.run">
<title>Running @greenpages@ from within Eclipse</title>
<para>
- Now that @greenpages@ is successfully imported into Eclipse, you can run the project directly from within the IDE. </para>
- <para>If you previously deployed the @greenpages@ PAR to @webserv@ by copying the PAR file to the <literal>pickup</literal> directory, be sure you now remove it so that it does not conflict with the deployment of the Eclipse project. On Unix:</para>
+ Now that @greenpages@ is successfully imported into Eclipse, run the project directly from within the IDE.</para>
+ <para>If the @greenpages@ PAR file was copied to the <literal>pickup</literal> directory, be sure it is now removed so that it does not conflict with the deployment of the Eclipse project. On Unix:</para>
<programlisting>prompt$ cd $VWS_HOME/pickup
prompt$ rm greenpages-solution-@app.version@.par</programlisting>
@@ -429,7 +429,7 @@ prompt$ rm greenpages-solution-@app.version@.par</programlisting>
<programlisting>prompt> cd %VWS_HOME%\pickup
prompt> del greenpages-solution-@app.version@.par</programlisting>
- <para>Also, to prevent conflicts with the server configured in Eclipse, stop a currently-running @webserv@ by typing <literal>Control-C</literal> in the console window from which you started the server. </para>
+ <para>Also, to prevent conflicts with the server configured in Eclipse, stop a currently-running @webserv@ by typing <literal>Control-C</literal> in the console window.</para>
<para>
To run @greenpages@ from within Eclipse:
diff --git a/getting-started/src/installing.xml b/getting-started/src/installing.xml
index 004d554..47723a6 100644
--- a/getting-started/src/installing.xml
+++ b/getting-started/src/installing.xml
@@ -75,8 +75,8 @@ prompt> set VWS_HOME=C:\@webserv.expanded.dir@
To verify the installation, issue the command:
<literal>"%VWS_HOME%"\bin\startup.bat</literal> and ensure a message numbered <literal>UR0001I</literal>
is displayed.
-You will see many other messages about starting and installing other required artifacts,
-but the <literal>UR0001I</literal> message indicates that the user region is ready for your use.
+Many other messages about starting and installing other required artifacts are produced,
+but the <literal>UR0001I</literal> message indicates that the user region is ready for use.
(<emphasis>Timestamps have been removed
and thread names and other details may vary with different installations and versions.</emphasis>)
<programlisting>system-artifacts &lt;TC0000I&gt; Starting Tomcat.
@@ -117,8 +117,8 @@ prompt$ export VWS_HOME=<emphasis>/path/to/home/</emphasis>springsource/@webserv
<para>
To verify the installation, use a terminal window to issue the command:
<literal>$VWS_HOME/bin/startup.sh</literal> and ensure a message numbered <literal>UR0001I</literal> is displayed.
-You will see many other messages about starting and installing other required artifacts,
-but the <literal>UR0001I</literal> message indicates that the user region is ready for your use.
+Many other messages about starting and installing other required artifacts are produced,
+but the <literal>UR0001I</literal> message indicates that the user region is ready for use.
(<emphasis>Timestamps have been removed
and thread names and other details may vary with different installations and versions.</emphasis>)
<programlisting>system-artifacts &lt;TC0000I&gt; Starting Tomcat.
@@ -160,7 +160,7 @@ the latest revision of @greenpages@, currently @greenpages.version@.
</para>
<para>
-If you prefer to use vanilla Eclipse, please refer to the installation instructions in the
+It is possible to use vanilla Eclipse, and add the @dmst@ to it. Please refer to the installation instructions in the
<ulink url="http://www.eclipse.org/virgo/documentation/">Virgo Programmer Guide</ulink>.
</para>
@@ -208,7 +208,7 @@ The first time there may be a short delay due to the initial set-up of indexes.
<para>
@sts@ runs on Eclipse using Java Version 1.6, and @webserv@ requires Java Version 1.6.
The @greenpages@ application built here also requires Java Version 1.6.
- You should not need to alter the default Java compiler settings in @sts.short@ before proceeding.
+ The default Java compiler settings in @sts.short@ should not need adjusting, but should be checked.
</para>
</section>
diff --git a/getting-started/src/testing-greenpages.xml b/getting-started/src/testing-greenpages.xml
index 3feacf6..0988e97 100644
--- a/getting-started/src/testing-greenpages.xml
+++ b/getting-started/src/testing-greenpages.xml
@@ -90,8 +90,8 @@ public class JpaDirectorySpringContextTests {
<title>Contributing OSGi sourced dependencies</title>
<para>
In the previous step the <classname>JpaDirectorySpringContextTests</classname> test failed because it did
- not have a <interfacename>DataSource</interfacename> to be injected. In this step, you will instantiate an
- <quote>in-process</quote> database for testing and populate it with data.
+ not have a <interfacename>DataSource</interfacename> to be injected. In this step, an
+ <quote>in-process</quote> database is instantiated and populated with data for testing.
</para>
<para>
@@ -141,8 +141,8 @@ public class JpaDirectorySpringContextTests {
<interfacename>DataSource</interfacename> dependency.
When integration testing it is often a good idea to
test the entire application outside of the container.
- In this step you will create a test case for the
- entire @greenpages@ application starting with the <classname>@greenpages@Controller</classname> class
+ In this step a test case for the
+ entire @greenpages@ application is created, starting with the <classname>@greenpages@Controller</classname> class
and descending all the way to a database.
It would be sensible to create this in a separate test bundle
but as one of the bundles involved here is a web bundle the tests will have to go in there.
diff --git a/getting-started/src/web-module/deploy-bundle.xml b/getting-started/src/web-module/deploy-bundle.xml
index febe12e..117e15a 100644
--- a/getting-started/src/web-module/deploy-bundle.xml
+++ b/getting-started/src/web-module/deploy-bundle.xml
@@ -32,8 +32,7 @@
</para>
<para>
- (Eclipse may open its internal web browser as this is a web project. You can choose to use this or just
- close it and use another browser later.)
+ (Eclipse may open its internal web browser as this is a web project. This or another browser can be used.)
</para>
<para>
diff --git a/getting-started/src/web-module/osgi-reference.xml b/getting-started/src/web-module/osgi-reference.xml
index 16255f6..36a3d5e 100644
--- a/getting-started/src/web-module/osgi-reference.xml
+++ b/getting-started/src/web-module/osgi-reference.xml
@@ -49,8 +49,8 @@ Bundle-Version: 2.0]]>
Now that the <literal>greenpages.app</literal> bundle exports the package that the
<interfacename>Directory</interfacename> and <interfacename>Listing</interfacename> interfaces reside in,
the <literal>greenpages.web</literal> bundle must import it.
- In this step you will update the Maven
- <filename>pom.xml</filename> file to depend on the <literal>greenpages.app</literal> bundle and import the
+ In this step the Maven
+ <filename>pom.xml</filename> file is updated to depend on the <literal>greenpages.app</literal> bundle and import the
package.
</para>