Author: isudana
Date: Thu Dec 29 03:20:54 2016
New Revision: 1776372
URL: http://svn.apache.org/viewvc?rev=1776372&view=rev
Log:
Patch by Chanaka for SYNAPSE-1088
Modified:
synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/deployment.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/installation.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/quick_start.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/setup/index.xml
Modified: synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh?rev=1776372&r1=1776371&r2=1776372&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh (original)
+++ synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh Thu Dec 29
03:20:54 2016
@@ -100,15 +100,16 @@ SYNAPSE_CLASSPATH=$SYNAPSE_HOME/reposito
#jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.6`
jdk_17=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.7`
+jdk_18=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.8`
-if [ "$jdk_16" -o "$jdk_17" ]; then
+if [ "$jdk_16" -o "$jdk_17" -o "$jdk_18" ]; then
# echo " Using Bouncy castle JAR for Java 1.5"
for f in $SYNAPSE_HOME/lib/bcprov-jdk15*.jar
do
SYNAPSE_CLASSPATH=$f:$SYNAPSE_CLASSPATH
done
else
- echo " [Warn] Synapse is tested only with Java 1.6 and 1.7"
+ echo " [Warn] Synapse is tested only with Java 1.8 and prior versions
(till 1.6)"
fi
# For Cygwin, switch paths to Windows format before running java
Modified:
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/deployment.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/deployment.xml?rev=1776372&r1=1776371&r2=1776372&view=diff
==============================================================================
---
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/deployment.xml
(original)
+++
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/deployment.xml
Thu Dec 29 03:20:54 2016
@@ -59,8 +59,8 @@
<p>
Synapse requires Java 1.6 or higher and has been tested on
Java runtime environments
- from Sun, IBM and Apple. Note that the recommended Java
version is 1.7. Synapse is
- used on various operation systems, including Linux, Mac OS X,
Solaris, Windows and AIX,
+ from Sun, IBM and Apple.Synapse is used on various operation
systems,
+ including Linux, Mac OS X, Solaris, Windows and AIX,
as well as mainframe environments. The recommended operation
system for production use
is Linux since it offers a wider range of options to tune the
TCP/IP stack. This is
important to optimize the performance of the NIO HTTP
transport.
Modified:
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/installation.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/installation.xml?rev=1776372&r1=1776371&r2=1776372&view=diff
==============================================================================
---
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/installation.xml
(original)
+++
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/installation.xml
Thu Dec 29 03:20:54 2016
@@ -64,7 +64,7 @@
</a>
</td>
<td>
- 1.6.0_23 or higher - recommended JDK 1.7.x,
untested on JDK 1.8.x (For instructions on setting up the JDK on different
+ 1.6.0_23 or higher (For instructions on setting up
the JDK on different
operating systems, visit<a
href="http://www.oracle.com/technetwork/java/index.html";>
Java homepage.
Modified:
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/quick_start.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/quick_start.xml?rev=1776372&r1=1776371&r2=1776372&view=diff
==============================================================================
---
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/quick_start.xml
(original)
+++
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/quick_start.xml
Thu Dec 29 03:20:54 2016
@@ -40,8 +40,7 @@
</p>
<ul>
<li>
- A Java runtime - JDK or JRE of version 1.6.x or higher
- (1.6.x or 1.7.x is recommended. 1.8.x is not tested enough)
+ A Java runtime - JDK or JRE of version 1.6.0_23 or higher
</li>
<li>
Apache Ant <a
href="http://ant.apache.org";>http://ant.apache.org</a>
Modified:
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/setup/index.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/setup/index.xml?rev=1776372&r1=1776371&r2=1776372&view=diff
==============================================================================
---
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/setup/index.xml
(original)
+++
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/setup/index.xml
Thu Dec 29 03:20:54 2016
@@ -49,8 +49,8 @@
Please make sure you have them properly installed and
configured in your system.
</p>
<ul>
- <li>A Java runtime - JDK or JRE of version 1.6.x or higher
- (1.6.x or 1.7.x is recommended. 1.8.x has not been tested
enough)</li>
+ <li>A Java runtime - JDK or JRE of version 1.6.0_23 or higher
+ </li>
<li><a href="http://ant.apache.org";>Apache Ant</a> version
1.6.5 or higher</li>
<li>
A command line interface such as 'Command Prompt' on
Windows and the Bash shell
