summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-10-28 07:00:51 (EDT)
committer Glyn Normington2010-11-02 08:21:15 (EDT)
commite27afbb30a24f1622db3754df55973e3de1222ac (patch)
tree489cabf039f2dcf71d8d8493b8f047af5f9eab08
parent0598a0b9795777c70b109f436bbe261589350bf9 (diff)
downloadorg.eclipse.virgo.documentation-e27afbb30a24f1622db3754df55973e3de1222ac.zip
org.eclipse.virgo.documentation-e27afbb30a24f1622db3754df55973e3de1222ac.tar.gz
org.eclipse.virgo.documentation-e27afbb30a24f1622db3754df55973e3de1222ac.tar.bz2
Update Middle Tier section of getting started for 2.1.0.RELEASE
-rw-r--r--getting-started/images/middle-tier/config-bundle-project.pngbin60841 -> 68718 bytes
-rw-r--r--getting-started/images/middle-tier/create-bundle-project.pngbin73939 -> 96883 bytes
-rw-r--r--getting-started/images/middle-tier/new-bundle-project.pngbin41965 -> 44588 bytes
-rw-r--r--getting-started/images/web-module/create-par-project.pngbin63263 -> 61282 bytes
-rw-r--r--getting-started/images/web-module/import-greenpages-app.pngbin72264 -> 75035 bytes
-rw-r--r--getting-started/images/web-module/import-parent-project.pngbin0 -> 74935 bytes
-rw-r--r--getting-started/images/web-module/new-par-project.pngbin41818 -> 45077 bytes
-rw-r--r--getting-started/images/web-module/new-server-runtime-environment.pngbin46450 -> 53108 bytes
-rw-r--r--getting-started/images/web-module/par-content.pngbin52040 -> 56113 bytes
-rw-r--r--getting-started/images/web-module/virgo-web-server.pngbin50716 -> 55901 bytes
-rw-r--r--getting-started/src/automated-build.xml2
-rw-r--r--getting-started/src/middle-tier/applying-best-practices.xml4
-rw-r--r--getting-started/src/middle-tier/building-jpa-module.xml9
-rw-r--r--getting-started/src/middle-tier/create-db-project.xml37
-rw-r--r--getting-started/src/middle-tier/middle-tier.xml8
-rw-r--r--getting-started/src/web-module/controller.xml18
-rw-r--r--getting-started/src/web-module/deploy-bundle.xml12
-rw-r--r--getting-started/src/web-module/osgi-reference.xml10
-rw-r--r--getting-started/src/web-module/osgi-service.xml4
-rw-r--r--getting-started/src/web-module/par-project.xml25
-rw-r--r--getting-started/src/web-module/setting-up.xml8
21 files changed, 89 insertions, 48 deletions
diff --git a/getting-started/images/middle-tier/config-bundle-project.png b/getting-started/images/middle-tier/config-bundle-project.png
index e3d9a9e..abc60c7 100644
--- a/getting-started/images/middle-tier/config-bundle-project.png
+++ b/getting-started/images/middle-tier/config-bundle-project.png
Binary files differ
diff --git a/getting-started/images/middle-tier/create-bundle-project.png b/getting-started/images/middle-tier/create-bundle-project.png
index aeceaad..b3b6d81 100644
--- a/getting-started/images/middle-tier/create-bundle-project.png
+++ b/getting-started/images/middle-tier/create-bundle-project.png
Binary files differ
diff --git a/getting-started/images/middle-tier/new-bundle-project.png b/getting-started/images/middle-tier/new-bundle-project.png
index 43ff89a..ffe4a51 100644
--- a/getting-started/images/middle-tier/new-bundle-project.png
+++ b/getting-started/images/middle-tier/new-bundle-project.png
Binary files differ
diff --git a/getting-started/images/web-module/create-par-project.png b/getting-started/images/web-module/create-par-project.png
index 592a9ab..c2b379a 100644
--- a/getting-started/images/web-module/create-par-project.png
+++ b/getting-started/images/web-module/create-par-project.png
Binary files differ
diff --git a/getting-started/images/web-module/import-greenpages-app.png b/getting-started/images/web-module/import-greenpages-app.png
index 875cfb0..acc9cb9 100644
--- a/getting-started/images/web-module/import-greenpages-app.png
+++ b/getting-started/images/web-module/import-greenpages-app.png
Binary files differ
diff --git a/getting-started/images/web-module/import-parent-project.png b/getting-started/images/web-module/import-parent-project.png
new file mode 100644
index 0000000..818a28c
--- /dev/null
+++ b/getting-started/images/web-module/import-parent-project.png
Binary files differ
diff --git a/getting-started/images/web-module/new-par-project.png b/getting-started/images/web-module/new-par-project.png
index 455f6c5..13ff6f7 100644
--- a/getting-started/images/web-module/new-par-project.png
+++ b/getting-started/images/web-module/new-par-project.png
Binary files differ
diff --git a/getting-started/images/web-module/new-server-runtime-environment.png b/getting-started/images/web-module/new-server-runtime-environment.png
index e757548..ec117a2 100644
--- a/getting-started/images/web-module/new-server-runtime-environment.png
+++ b/getting-started/images/web-module/new-server-runtime-environment.png
Binary files differ
diff --git a/getting-started/images/web-module/par-content.png b/getting-started/images/web-module/par-content.png
index 5868dca..ed5cbe9 100644
--- a/getting-started/images/web-module/par-content.png
+++ b/getting-started/images/web-module/par-content.png
Binary files differ
diff --git a/getting-started/images/web-module/virgo-web-server.png b/getting-started/images/web-module/virgo-web-server.png
index db07377..6c3c2f4 100644
--- a/getting-started/images/web-module/virgo-web-server.png
+++ b/getting-started/images/web-module/virgo-web-server.png
Binary files differ
diff --git a/getting-started/src/automated-build.xml b/getting-started/src/automated-build.xml
index e1c730b..64d5867 100644
--- a/getting-started/src/automated-build.xml
+++ b/getting-started/src/automated-build.xml
@@ -285,7 +285,7 @@
The output from Maven should include lines like these
<programlisting><![CDATA[[INFO] [par:par]
[INFO] Assembling Artifacts for PAR '/Users/chrisfrost/Repos/GIT/greenpages/solution/
- greenpages/target/greenpages-solution-2.0.0.SNAPSHOT.par'
+ greenpages/target/greenpages-solution-2.3.0.RELEASE.par'
[INFO] Added 'greenpages.app-solution.jar'
[INFO] Added 'greenpages.jpa-solution.jar'
[INFO] Added 'greenpages.db-solution.jar'
diff --git a/getting-started/src/middle-tier/applying-best-practices.xml b/getting-started/src/middle-tier/applying-best-practices.xml
index 715743d..aa652ed 100644
--- a/getting-started/src/middle-tier/applying-best-practices.xml
+++ b/getting-started/src/middle-tier/applying-best-practices.xml
@@ -102,11 +102,11 @@ final class JpaDirectory implements Directory {
At this point the redeploy of the @greenpages@ application may fail with an error similar to this:
<programlisting><![CDATA[<SPDE0100E> The class with name 'org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor',
referenced by bean 'org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor#0',
-could not be loaded by class loader 'ServerBundleClassLoader: [bundle=greenpages-1-greenpages.jpa_2.0.0]':
+could not be loaded by class loader 'ServerBundleClassLoader: [bundle=greenpages-1-greenpages.jpa_2.3.0]':
…]]>
</programlisting>
which indicates that there is some package (<code>org.springframework.dao.annotation</code>) which is not
-available to the <quote><code>BundleClassLoader</code></quote> for bundle <code>greenpages-1-greenpages.jpa_2.0.0</code>.
+available to the <quote><code>BundleClassLoader</code></quote> for bundle <code>greenpages-1-greenpages.jpa_2.3.0</code>.
We should look in the <literal>MANIFEST.MF</literal> file for this bundle, and see that this package is not
imported (in the <literal>Import-Package</literal> header). Since Bundlor generated this file (controlled by the
template file <literal>template.mf</literal>) we should check that the manifest was re-generated on our last change.
diff --git a/getting-started/src/middle-tier/building-jpa-module.xml b/getting-started/src/middle-tier/building-jpa-module.xml
index 8893c6d..a8203b3 100644
--- a/getting-started/src/middle-tier/building-jpa-module.xml
+++ b/getting-started/src/middle-tier/building-jpa-module.xml
@@ -228,7 +228,7 @@ private EntityManager em;
The <literal>greenpages.db</literal> module already publishes a
<literal>DataSource</literal> to the service registry.
<literal>greenpages.jpa</literal> must now be
- updated to consume this <literal>dataSource</literal>.
+ updated to consume this.
</para>
<para>
@@ -283,7 +283,7 @@ Excluded-Exports: greenpages.jpa
The <literal>Import-Package</literal> entries for
<literal>org.springframework.context.weaving</literal> and
<literal>org.springframework.transaction.aspectj</literal> are needed as Bundlor cannot, yet,
- detect that these packages are required based on the contents of the bundle&rsquo;s application context.
+ detect that these packages are required.
</para>
<para>
@@ -294,7 +294,7 @@ Excluded-Exports: greenpages.jpa
<para>
Switch to the <emphasis>Overview</emphasis> tab and click <emphasis>Update MANIFEST.MF</emphasis>.
- As with <literal>greenpages.db</literal> before, this update will result in some errors being
+ As with <literal>greenpages.db</literal> before, this update may result in some errors being
reported in the manifest as the project is not associated with a targetted runtime. Double-click the
<literal>MANIFEST.MF</literal> file in the <literal>greenpages</literal> project in the Package Explorer.
Switch to the <emphasis>Dependencies</emphasis> tab and click <emphasis>Add…</emphasis>. Select
@@ -303,5 +303,8 @@ Excluded-Exports: greenpages.jpa
due to the addition of the <literal>greenpages.jpa</literal> module. This redeployment should succeed
and it&rsquo;s now time to try the application again.
</para>
+ <para>
+ (A possible action if this fails is to Update (@maven@) Dependencies on the project right-click menu in the @maven@ sub-menu.)
+ </para>
</section>
</section>
diff --git a/getting-started/src/middle-tier/create-db-project.xml b/getting-started/src/middle-tier/create-db-project.xml
index d13ced3..ab7b7db 100644
--- a/getting-started/src/middle-tier/create-db-project.xml
+++ b/getting-started/src/middle-tier/create-db-project.xml
@@ -14,9 +14,8 @@
<para>
Create a new project by right-clicking in the <emphasis>Package Explorer</emphasis> view and selecting
<menuchoice><guimenu>New</guimenu><guimenuitem>Project…</guimenuitem></menuchoice>. In the resulting
- dialog select <menuchoice><guimenu>Virgo Web Server</guimenu><guimenuitem>Bundle
- Project</guimenuitem></menuchoice> (or, with early builds of the Virgo tools, <menuchoice><guimenu>SpringSource dm Server</guimenu><guimenuitem>Bundle
- Project</guimenuitem></menuchoice>) and press <emphasis>Next</emphasis>:
+ dialog select <menuchoice><guimenu>EclipseRT</guimenu><guimenuitem>Bundle
+ Project</guimenuitem></menuchoice> and press <emphasis>Next</emphasis>:
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/middle-tier/new-bundle-project.png" format="PNG" align="center" width="8cm"/>
@@ -32,7 +31,8 @@
Choose the create the project from an existing source location and specify a location that will place the new
<literal>greenpages.db</literal> alongside the project skeletons that were imported into the workspace
earlier. If the <literal>start</literal> directory of the @greenpages@ sample is being used this will
- be <literal>$GREENPAGES_HOME/start/greenpages.db</literal>. Click <emphasis>Next</emphasis>.
+ be <literal>$GREENPAGES_HOME/start/greenpages.db</literal> (and, <emphasis>mutatis mutandis</emphasis> on Windows).
+ Click <emphasis>Next</emphasis>.
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/middle-tier/create-bundle-project.png" format="PNG" align="center" width="12cm"/>
@@ -51,9 +51,11 @@
</para>
<para>
Change the <literal>Bundle-Name</literal> to <quote><literal>@greenpages@ DataSource</literal></quote> to more accurately
- describe the bundle&rsquo;s purpose. An option to select a &lsquo;Bundle Classpath Container&rsquo; is already selected. It should
- be de-selected, as a Maven Classpath container will be configured later. Ensure that the <emphasis>Target Runtime</emphasis>
- is set to <emphasis>Virgo Web Server (Runtime) v2.1</emphasis>. Click <emphasis>Finish</emphasis>.
+ describe the bundle&rsquo;s purpose. An option to &lsquo;Enable Bundle Classpath Container&rsquo; is already selected. It should
+ be <emphasis>de</emphasis>-selected, as a @maven@ Classpath container will be configured later.
+ Ensure that the <emphasis>Target Runtime</emphasis>
+ is set to <emphasis>Virgo Web Server (Runtime) v2.1</emphasis>.
+ Click <emphasis>Finish</emphasis>.
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/middle-tier/config-bundle-project.png" format="PNG" align="center" width="9cm"/>
@@ -101,7 +103,7 @@
</para>
<para>
- A Maven Classpath Container can now be added to the project. Right-click the
+ A @maven@ Classpath Container can now be added to the project. Right-click the
<literal>greenpages.db</literal> project in the Package Explorer and select
<menuchoice><guimenu>Maven 2</guimenu><guimenuitem>Enable dependency management</guimenuitem></menuchoice>.
Eclipse will perform some workspace building, and the <literal>greenpages.db</literal> project will now be marked as a Maven project.
@@ -143,6 +145,13 @@
</imageobject>
</mediaobject>
</para>
+ <para>
+ (It is useful to check that the @maven@ project just configured has the correct Java System library associated with it and that
+ the <literal>MANIFEST.MF</literal> file that we have just moved is correctly generated when necessary.
+ To ensure this, disable the dependency management (enabled in the previous section) and then re-enable it, saving the changes in between.
+ This step may also change the Java system libraries associated with the build (right-click on the <literal>greenpages.db</literal> project, under Properties, Java build path and Libraries).
+ If the Java system libraries look incorrect, simply remove them in the Libraries window and reset them.)
+ </para>
</section>
<section id="middle-tier.create-db-project.config-datasource">
@@ -220,7 +229,12 @@
<menuchoice><guimenu>New </guimenu><guimenuitem>Spring Bean Configuration File</guimenuitem></menuchoice> again.
This time specify
a name of <literal>osgi-context.xml</literal>, click <emphasis>Next</emphasis>, and add the <literal>osgi</literal>
- namespace declaration (ensure that the resultant schema location string contains the URL <literal>http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd</literal> as <literal>http://www.springframework.org/schema/osgi/spring-osgi-2.0-m1.xsd</literal> with result in an obscure deployment failure due to an invalid 'cacheTarget' property).
+ namespace declaration
+ (ensure that the resultant schema location string contains the URL
+ <literal>http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd</literal>
+ as
+ <literal>http://www.springframework.org/schema/osgi/spring-osgi-2.0-m1.xsd</literal>
+ will result in an obscure deployment failure due to an invalid 'cacheTarget' property).
Click <emphasis>Finish</emphasis> and then add the following to the new file to publish the
<literal>DataSource</literal> as a service:
<programlisting language="xml"><![CDATA[ <!--
@@ -322,5 +336,10 @@
Although the application web front-end will run, the database contents is
not visible, of course, because we are still running with the <emphasis>stub</emphasis> version of the <code>search</code> method on the controller.
The implementation of the <code>Directory</code> service needs to be changed to exploit the database.</para>
+
+ <para>
+ (One possible cause of failure here is the username and password on the <literal>dataSource</literal>
+ bean defined in <literal>module-context.xml</literal>. Check that these are exactly correct.)
+ </para>
</section>
</section>
diff --git a/getting-started/src/middle-tier/middle-tier.xml b/getting-started/src/middle-tier/middle-tier.xml
index 1802f28..361e437 100644
--- a/getting-started/src/middle-tier/middle-tier.xml
+++ b/getting-started/src/middle-tier/middle-tier.xml
@@ -20,10 +20,10 @@
<tgroup cols="4">
<tbody>
<row>
- <entry>LISTING_NUMBER</entry>
- <entry>FIRST_NAME</entry>
- <entry>LAST_NAME</entry>
- <entry>EMAIL_ADDRESS</entry>
+ <entry><literal>LISTING_NUMBER</literal></entry>
+ <entry><literal>FIRST_NAME</literal></entry>
+ <entry><literal>LAST_NAME</literal></entry>
+ <entry><literal>EMAIL_ADDRESS</literal></entry>
</row>
</tbody>
</tgroup>
diff --git a/getting-started/src/web-module/controller.xml b/getting-started/src/web-module/controller.xml
index 17a911e..d7d4e34 100644
--- a/getting-started/src/web-module/controller.xml
+++ b/getting-started/src/web-module/controller.xml
@@ -4,7 +4,7 @@
<section id="controller">
<title>The controller</title>
<para>
- The Spring&rsquo;s @MVC style of web application development is used in which the central type
+ The Spring&rsquo;s MVC style of web application development is used in which the central type
is the <literal>Controller</literal> class.
</para>
@@ -25,14 +25,14 @@
<para>
(Initially this project may have compiler errors;
this is to be expected particularly if the @maven@ repository hasn&rsquo;t yet been created.)
- <mediaobject>
- <imageobject role="fo">
- <imagedata fileref="images/web-module/import-greenpages-web.png" format="PNG" align="center" width="10cm"/>
- </imageobject>
- <imageobject role="html">
- <imagedata fileref="images/web-module/import-greenpages-web.png" format="PNG" align="center"/>
- </imageobject>
- </mediaobject>
+<!-- <mediaobject>-->
+<!-- <imageobject role="fo">-->
+<!-- <imagedata fileref="images/web-module/import-greenpages-web.png" format="PNG" align="center" width="10cm"/>-->
+<!-- </imageobject>-->
+<!-- <imageobject role="html">-->
+<!-- <imagedata fileref="images/web-module/import-greenpages-web.png" format="PNG" align="center"/>-->
+<!-- </imageobject>-->
+<!-- </mediaobject>-->
When this project is imported go to the next step.
</para>
</section>
diff --git a/getting-started/src/web-module/deploy-bundle.xml b/getting-started/src/web-module/deploy-bundle.xml
index 117e15a..a9fb3ee 100644
--- a/getting-started/src/web-module/deploy-bundle.xml
+++ b/getting-started/src/web-module/deploy-bundle.xml
@@ -32,12 +32,8 @@
</para>
<para>
- (Eclipse may open its internal web browser as this is a web project. This or another browser can be used.)
- </para>
-
- <para>
- If deployment has gone successfully the console will contain the message
- <literal>&lt;DE0005I&gt; Started bundle 'greenpages.web' version '2.0.0'.</literal>
+ If deployment is successful the console will contain the message:
+ <programlisting>&lt;DE0005I&gt; Started bundle 'greenpages.web' version '@app.version.number@'</programlisting>
</para>
<para>
Leave the server instance running and go to the next step.
@@ -102,8 +98,8 @@ Import-Package: org.eclipse.virgo.web.dm;version="[2.0.0, 3.0.0)
ework.web.servlet
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages.web
-Tool: Bundlor 1.0.0.M6
-Bundle-Version: 2.0]]>
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Version: 2.3.0]]>
</programlisting>
although the order of the entries may be different.
</para>
diff --git a/getting-started/src/web-module/osgi-reference.xml b/getting-started/src/web-module/osgi-reference.xml
index 36a3d5e..33d1a1f 100644
--- a/getting-started/src/web-module/osgi-reference.xml
+++ b/getting-started/src/web-module/osgi-reference.xml
@@ -35,9 +35,9 @@
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
Bundle-SymbolicName: greenpages
-Tool: Bundlor 1.0.0.M6
-Export-Package: greenpages;version="2.0"
-Bundle-Version: 2.0]]>
+Tool: Bundlor 1.0.0.RELEASE
+Export-Package: greenpages;version="2.3.0"
+Bundle-Version: 2.3.0]]>
</programlisting>
Go to the next step.
</para>
@@ -91,7 +91,7 @@ import org.springframework.web.bind.annotation.RequestParam;
Add the following package clause to the <literal>Import-Template</literal> entry in the
<filename>template.mf</filename> file in the <literal>greenpages.web</literal> project. When added run the
MANIFEST.MF generation on the project as described in <xref linkend="deploy.bundle.web.module.manifest"/>.
- <programlisting><![CDATA[greenpages.*;version="[2.0, 2.1)"]]></programlisting>
+ <programlisting><![CDATA[greenpages.*;version="[2.3, 2.4)"]]></programlisting>
Be careful to include the <quote><literal>.*</literal></quote> in the package pattern.
</para>
<para>
@@ -167,7 +167,7 @@ import org.springframework.web.bind.annotation.RequestParam;
The web bundle will not completely start.
<!-- After some time, the following error should occur:
<programlisting><![CDATA[<CC0001W> Mandatory reference '&directory' in bundle
- 'greenpages-1-greenpages.web' version '2.0.0' is waiting for service with filter
+ 'greenpages-1-greenpages.web' version '2.3.0' is waiting for service with filter
'(&(objectClass=greenpages.Directory)(!(org.eclipse.virgo.server.app.name=*)))'.]]>
</programlisting> -->
</para>
diff --git a/getting-started/src/web-module/osgi-service.xml b/getting-started/src/web-module/osgi-service.xml
index f9affcd..9751ccb 100644
--- a/getting-started/src/web-module/osgi-service.xml
+++ b/getting-started/src/web-module/osgi-service.xml
@@ -9,6 +9,8 @@
contributing an instance of this service to the Service Registry.
</para>
<para>Stop the server instance before proceeding.</para>
+
+
<section id="osgi.service.implementation">
<title>Add Implementation</title>
<para>
@@ -63,7 +65,6 @@ public class DirectoryImpl implements Directory {
the home page type <literal>wilkinson</literal> into the search field and press <emphasis>Submit</emphasis>.
Unlike the previous attempt, this should return a list (of size 1) of search results. From here, select
<emphasis>view</emphasis> to get the <quote>detailed</quote> listing.
- </para>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/web-module/greenpages-listing-success.png" format="PNG" align="center" width="15cm"/>
@@ -73,6 +74,7 @@ public class DirectoryImpl implements Directory {
</imageobject>
</mediaobject>
This uses a stub implementation of the <classname>Directory</classname> interface which only knows about <quote>Andy Wilkinson</quote>.
+ </para>
<para>
The web interface is complete enough. Go to the next chapter to see the middle tier implementation.
</para>
diff --git a/getting-started/src/web-module/par-project.xml b/getting-started/src/web-module/par-project.xml
index 61f3a55..d008509 100644
--- a/getting-started/src/web-module/par-project.xml
+++ b/getting-started/src/web-module/par-project.xml
@@ -23,6 +23,27 @@
Alternatively, the <literal>greenpages.web</literal> bundle can be removed from the @webserv@ instance,
or the server can be stopped while these changes are made.
</para>
+
+ <section id="parent.project.importing">
+ <title>Importing the parent project</title>
+ <para>
+ All of the bundles in the @greenpages@ sample are @maven@ projects which refer to a &lsquo;parent&rsquo; project.
+ To allow @sts.short@ to accommodate references to the parent, import this project first.
+ </para>
+ <para>
+ In the same way that the starting <literal>greenpages.web</literal> project was imported
+ (see <xref linkend="controller"/>)
+ import the <literal>$GREENPAGES_HOME/start/parent</literal> project.
+ <mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/web-module/import-parent-project.png" format="PNG" align="center" width="12cm"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/web-module/import-parent-project.png" format="PNG" align="center"/>
+ </imageobject>
+ </mediaobject>
+ </para>
+ </section>
<section id="par.project.importing.project">
<title>Importing the <literal>greenpages.app</literal> project</title>
@@ -100,7 +121,7 @@ public Listing entry(@RequestParam("id") int id) {
<para>
Right-click in the <emphasis>Package Explorer</emphasis> and select <menuchoice><guimenu>New</guimenu>
<guimenuitem>Project…</guimenuitem></menuchoice>. In the dialog that opens select
- <menuchoice><guimenu>@virgo@ @webserv@</guimenu><guimenuitem>PAR Project</guimenuitem></menuchoice> and press
+ <menuchoice><guimenu>EclipseRT</guimenu><guimenuitem>PAR Project</guimenuitem></menuchoice> and press
<emphasis>Next</emphasis>:
<mediaobject>
<imageobject role="fo">
@@ -127,7 +148,7 @@ public Listing entry(@RequestParam("id") int id) {
<para>
In the next dialog, some of the PAR properties are pre-populated.
Change the Application Name to <literal>Greenpages PAR</literal> and the Version to
- <literal>2.0.0</literal>, then
+ <literal>2.3.0</literal>, then
ensure that the <emphasis>Target Runtime</emphasis>
is set to <emphasis>Virgo Web Server (Runtime) v2.1</emphasis> and press <emphasis>Next</emphasis>.
<mediaobject>
diff --git a/getting-started/src/web-module/setting-up.xml b/getting-started/src/web-module/setting-up.xml
index 00dc186..fcee1bb 100644
--- a/getting-started/src/web-module/setting-up.xml
+++ b/getting-started/src/web-module/setting-up.xml
@@ -11,8 +11,8 @@
<section id="setting.up.eclipse">
<title>Setting up Eclipse (@sts.short@)</title>
<para>
- The following sections are most easily followed in the Java perspective (not, for example, the Java EE
- perspective). If not already in the Java perspective, switch to the Java perspective in @sts@ using the
+ The following sections are most easily followed in the Java (or Spring) perspective (not, for example, the Java EE
+ perspective). If not already in an appropriate perspective, switch in @sts@ using the
<guimenu>Open Perspective</guimenu> menu:
<mediaobject>
<imageobject role="fo">
@@ -26,7 +26,7 @@
<para>
In this step create a reference to the @webserv@ instance that the @greenpages@ application
- integrates with (this may already be created).
+ integrates with (the instance may already be created if the @greenpages@ solution has been run from @sts.short@).
</para>
<para>
@@ -48,7 +48,7 @@
<para>
In the next dialog, set the <emphasis>Virgo Web Server installation directory</emphasis> field to the
<emphasis>value</emphasis> of <literal>$VWS_HOME</literal> and
- check that the <emphasis>JRE:</emphasis> option is set to Java 1.6 or above.
+ check that the <emphasis>JRE:</emphasis> option is set to Java 1.6 or later.
<emphasis>This may not be the workbench default.</emphasis>
When complete, press <emphasis>Finish</emphasis>.
<mediaobject>