Author: gertv
Date: Sat May 4 19:47:28 2013
New Revision: 1479166
URL: http://svn.apache.org/r1479166
Log:
Update system requirements to include Java 7
Modified:
servicemix/documentation/branches/servicemix-4.5.x/src/main/webapp/quickstart/installation.conf
Modified:
servicemix/documentation/branches/servicemix-4.5.x/src/main/webapp/quickstart/installation.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/branches/servicemix-4.5.x/src/main/webapp/quickstart/installation.conf?rev=1479166&r1=1479165&r2=1479166&view=diff
==============================================================================
---
servicemix/documentation/branches/servicemix-4.5.x/src/main/webapp/quickstart/installation.conf
(original)
+++
servicemix/documentation/branches/servicemix-4.5.x/src/main/webapp/quickstart/installation.conf
Sat May 4 19:47:28 2013
@@ -2,16 +2,27 @@ h1. Installation
Before we can start working with Apache ServiceMix, we have to get it
installed and running on our local machine first.
h2. System requirements
-* Java Developer Kit (JDK) 1.6.x (Java 6), for both deployment and compiling.
\\ (Note: Java 7 is currently not supported)
-* About 100 MB of free disk space
+
+For running Apache ServiceMix itself, you'll need
+
+* Java Runtime Environment (JRE) 1.6.x (Java 6) or
+ Java Runtime Environment (JRE) 1.7.x (Java 7)
+* About 100 MB of free disk space for the default assembly
+
+If you're developing your own integration applications and OSGi bundles,
you'll also need
+
+* Java Developer Kit (JDK) 1.6.x (Java 6) or
+ Java Developer Kit (JDK) 1.7.x (Java 7)
+* Apache Maven 3.0.4 or higher
+
h2. Downloading Apache ServiceMix
Apache ServiceMix ${servicemix.version} is available under the Apache License
v2 and can be downloaded from [http://servicemix.apache.org/downloads.html].
Depending on your operation system, you should download either the tar.gz or
the zip file:
-* tar.gz for Linux/Unix/MacOS X
-* zip for Windows
+* {{tar.gz}} for Linux/Unix/MacOS X
+* {{zip}} for Windows
h2. Installing Apache ServiceMix
