bug 396119: Prepare the user documentation for the 2.2.0 release
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index 10a3389..798279a 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -16,9 +16,9 @@
cp $SRC/org.apache.juli.extras-7.0.32.*.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-7.0.32.jar
cp $SRC/org.apache.tomcat.api-7.0.32.*.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-7.0.32.jar
cp $SRC/org.apache.tomcat.util-7.0.32.*.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-7.0.32.jar
-cp $SRC/org.eclipse.gemini.web.core-2.1.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.1.0.jar
-cp $SRC/org.eclipse.gemini.web.extender-2.1.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.1.0.jar
-cp $SRC/org.eclipse.gemini.web.tomcat-2.1.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.1.0.jar
+cp $SRC/org.eclipse.gemini.web.core-2.2.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.2.0.jar
+cp $SRC/org.eclipse.gemini.web.extender-2.2.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.2.0.jar
+cp $SRC/org.eclipse.gemini.web.tomcat-2.2.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.2.0.jar
cp $SRC/org.eclipse.jdt.core.compiler.batch-3.8.0.*.jar $REPO/org.eclipse.jdt.core.compiler.batch/org.eclipse.jdt.core.compiler.batch-3.8.0.jar
cp $SRC/org.slf4j.api-1.7.2.*.jar $REPO/org.slf4j.api/org.slf4j.api-1.7.2.jar
cp $SRC/org.slf4j.nop-1.7.2.*.jar $REPO/org.slf4j.nop/org.slf4j.nop-1.7.2.jar
diff --git a/org.eclipse.gemini.web.documentation/programmer-guide/src/introduction.xml b/org.eclipse.gemini.web.documentation/programmer-guide/src/introduction.xml
index 3823b9b..bc296ee 100755
--- a/org.eclipse.gemini.web.documentation/programmer-guide/src/introduction.xml
+++ b/org.eclipse.gemini.web.documentation/programmer-guide/src/introduction.xml
@@ -5,8 +5,8 @@
<section id="intro">
<title>Introduction</title>
<para>
- @product.name@ implements the Web Container defined by the Web Applications Specification chapter of the OSGi Service Platform Release 4 Version 4.2 Enterprise Specification.
- This specification may be downloaded <ulink url="http://www.osgi.org/Download/Release4V42">here</ulink>.
+ @product.name@ implements the Web Container defined by the Web Applications Specification chapter of the OSGi Service Platform Release 4 Version 4.2 Enterprise Specification and later versions of the specification.
+ This specification may be downloaded <ulink url="http://www.osgi.org/Download/">here</ulink>.
</para>
</section>
</chapter>
\ No newline at end of file
diff --git a/org.eclipse.gemini.web.documentation/user-guide/src/configuring.xml b/org.eclipse.gemini.web.documentation/user-guide/src/configuring.xml
index 73d831f..be4eaf3 100755
--- a/org.eclipse.gemini.web.documentation/user-guide/src/configuring.xml
+++ b/org.eclipse.gemini.web.documentation/user-guide/src/configuring.xml
@@ -15,13 +15,17 @@
</para>
<para>Here's an extract of the default configuration distributed with the @short.product.name@.</para>
<programlisting language="xml"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<Server port="8005" shutdown="SHUTDOWN">
+<Server>
+
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<Service name="Catalina">
-
- <Connector port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
+
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
redirectPort="8443" />
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
@@ -29,7 +33,7 @@
<Engine name="Catalina" defaultHost="localhost">
<Host name="localhost" deployOnStartup="false" autoDeploy="false"
- unpackWARs="false" createDirs="false">
+ unpackWARs="false" createDirs="false" appBase="">
</Host>
</Engine>
@@ -46,7 +50,7 @@
</tip>
<itemizedlist>
<listitem>
- <para>The root element of the <literal>tomcat-server.xml</literal> file is <literal><Server></literal>. The attributes of this element represent the characteristics of the entire embedded Apache Tomcat servlet container. The <literal>shutdown</literal> attribute specifies the command string that the shutdown port number receives via a TCP/IP connection in order to shut down the servlet container. The <literal>port</literal> attribute specifies the TCP/IP port number that listens for a shutdown message.</para>
+ <para>The root element of the <literal>tomcat-server.xml</literal> file is <literal><Server></literal>. The attributes of this element represent the characteristics of the entire embedded Apache Tomcat servlet container.</para>
</listitem>
<listitem>
<para>The <literal><Listener></literal> XML elements specify the list of lifecycle listeners that monitor and manage the embedded Apache Tomcat servlet container. Each listener class is a Java Management Extensions (JMX) MBean that listens to a specific component of the servlet container and has been programmed to do something at certain lifecycle events of the component, such as before starting up, after stopping, and so on.</para>
@@ -152,10 +156,6 @@
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
<url-pattern>*.jspx</url-pattern>
</servlet-mapping>
diff --git a/org.eclipse.gemini.web.documentation/user-guide/src/installing.xml b/org.eclipse.gemini.web.documentation/user-guide/src/installing.xml
index 209faae..e824b7b 100755
--- a/org.eclipse.gemini.web.documentation/user-guide/src/installing.xml
+++ b/org.eclipse.gemini.web.documentation/user-guide/src/installing.xml
@@ -14,7 +14,7 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://download.eclipse.org/equinox/">Download</ulink> the Equinox JAR, for example <ulink url="http://download.eclipse.org/equinox/drops/R-3.7.2-201202080800/download.php?dropFile=org.eclipse.osgi_3.7.2.v20120110-1415.jar">org.eclipse.osgi_3.7.2.v20120110-1415.jar</ulink>, and move it to a suitable directory (e.g. ~/gemini-web-test).
+ <ulink url="http://download.eclipse.org/equinox/">Download</ulink> the Equinox JAR, for example <ulink url="http://download.eclipse.org/equinox/drops/R-3.8.1-201209141800/download.php?dropFile=org.eclipse.osgi_3.8.1.v20120830-144521.jar">org.eclipse.osgi_3.8.1.v20120830-144521.jar</ulink>, and move it to a suitable directory (e.g. ~/gemini-web-test).
On the <ulink url="http://download.eclipse.org/equinox/">Download</ulink> page, first choose the desired Release or Build, then download the JAR from the Framework section.
</para>
</listitem>
@@ -27,14 +27,14 @@
<listitem>
<para>
Configure Equinox by creating a directory ~/gemini-web-test/configuration and create a file config.ini in the configuration directory.
- Example file which works with 2.1.0.RELEASE is available in <ulink url="http://wiki.eclipse.org/images/2/23/Config.ini.2.1.0.zip">config.ini.zip</ulink>.
+ Example file which works with 2.2.0.RELEASE is available in <ulink url="http://wiki.eclipse.org/images/2/23/Config.ini.2.2.0.zip">config.ini.zip</ulink>.
Essentially config.ini ensures that the dependencies of @product.name@, which come in the dep directory, are installed and then the @product.name@ bundles are installed and started.
</para>
</listitem>
<listitem>
<para>
Start Equinox as follows:
- <programlisting language="xml"><![CDATA[java -jar org.eclipse.osgi_3.7.2.v20120110-1415.jar -console]]></programlisting></para>
+ <programlisting language="xml"><![CDATA[java -jar org.eclipse.osgi_3.8.1.v20120830-144521.jar -console]]></programlisting></para>
</listitem>
<listitem>
<para>
diff --git a/org.eclipse.gemini.web.documentation/user-guide/src/introduction.xml b/org.eclipse.gemini.web.documentation/user-guide/src/introduction.xml
index 0f43cdb..7ac07ba 100755
--- a/org.eclipse.gemini.web.documentation/user-guide/src/introduction.xml
+++ b/org.eclipse.gemini.web.documentation/user-guide/src/introduction.xml
@@ -5,8 +5,8 @@
<section id="intro">
<title>Introduction</title>
<para>
- @product.name@ implements the Web Container defined by the Web Applications Specification chapter of the OSGi Service Platform Release 4 Version 4.2 Enterprise Specification.
- This specification may be downloaded <ulink url="http://www.osgi.org/Download/Release4V42">here</ulink>.
+ @product.name@ implements the Web Container defined by the Web Applications Specification chapter of the OSGi Service Platform Release 4 Version 4.2 Enterprise Specification and later versions of the specification.
+ This specification may be downloaded <ulink url="http://www.osgi.org/Download/">here</ulink>.
</para>
</section>
<section id="about-this-guide">
