svn commit: r1424385 - in /karaf/eik/trunk/manual/src/main/webapp: developers-guide/prerequisites.conf user-guide/installation.conf user-guide/prerequisites.conf

[jb...@apache.org]

Author: jbonofre
Date: Thu Dec 20 09:54:57 2012
New Revision: 1424385

URL: http://svn.apache.org/viewvc?rev=1424385&view=rev
Log:
Update EIK documentation

Modified:
    karaf/eik/trunk/manual/src/main/webapp/developers-guide/prerequisites.conf
    karaf/eik/trunk/manual/src/main/webapp/user-guide/installation.conf
    karaf/eik/trunk/manual/src/main/webapp/user-guide/prerequisites.conf

Modified: karaf/eik/trunk/manual/src/main/webapp/developers-guide/prerequisites.conf
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/developers-guide/prerequisites.conf?rev=1424385&r1=1424384&r2=1424385&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/developers-guide/prerequisites.conf (original)
+++ karaf/eik/trunk/manual/src/main/webapp/developers-guide/prerequisites.conf Thu Dec 20 09:54:57 2012
@@ -5,8 +5,8 @@ For import eik project in eclipse withou
 *Environment:*
 * Java SE Development Kit 1.6.x or greater ([http://www.oracle.com/technetwork/java/javase/]).
 * Apache Maven 3.0.3 ([http://maven.apache.org/download.html]).
-* Eclipse IDE for Java EE Developers (Helios (Eclipse 3.6.x) or Galileo (Eclipse 3.5.x))([http://www.eclipse.org/downloads/]).
-* Apache KARAF 2.2.x ([http://karaf.apache.org/index/community/download.html]);
+* Eclipse IDE Eclipse for RCP and RAP Developers ([http://www.eclipse.org/downloads/packages/release/indigo/sr2]).
+* Apache KARAF 2.2.x or 2.3.x ([http://karaf.apache.org/index/community/download.html]);
 * m2e(clipse) plugins ([http://eclipse.org/m2e/])
 * Tycho Project Configurators it is downloaded automatically when inport EIK in eclipse with m2e version 0.6.0 or higher
 * WST server tools download from *Install Manager* version 3.2.100.v20110303-51EoAkF77g8HBSc or higher

Modified: karaf/eik/trunk/manual/src/main/webapp/user-guide/installation.conf
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/user-guide/installation.conf?rev=1424385&r1=1424384&r2=1424385&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/user-guide/installation.conf (original)
+++ karaf/eik/trunk/manual/src/main/webapp/user-guide/installation.conf Thu Dec 20 09:54:57 2012
@@ -5,15 +5,6 @@ EIK can be installed in two ways.
 * from update site
 * Installing a Plug-in Manually
 
-
-h3. From Update site
-
-From eclipse menu we need *Select Help > Install new Software ...*, 
-Add Eik URL <tobe defined> Follow procedure the step by step and then restart IDE.
-
-!/images/installation_1.png!
-
-
 h3. Installing a Plug-in Manually
 
 From eik trunk doing a quick build. 
@@ -27,8 +18,8 @@ mvn -DskipTests clean install 
 
 
 *Select Help > Install new software > Add.. > Archive...*
-select zip file under
-<path_to_source>/features/org.apache.karaf.eik.update/target/org.apache.karaf.eik.update.zip
+select folder
+<path_to_source>/features/org.apache.karaf.eik.repository/target/repository
 
 
 !/images/installation_2.png!

Modified: karaf/eik/trunk/manual/src/main/webapp/user-guide/prerequisites.conf
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/user-guide/prerequisites.conf?rev=1424385&r1=1424384&r2=1424385&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/user-guide/prerequisites.conf (original)
+++ karaf/eik/trunk/manual/src/main/webapp/user-guide/prerequisites.conf Thu Dec 20 09:54:57 2012
@@ -3,10 +3,10 @@ h1. Prerequisites
 *Environment:*
 * Java SE Development Kit 1.6.x or greater ([http://www.oracle.com/technetwork/java/javase/]).
 * Apache Maven 3.0.3 ([http://maven.apache.org/download.html]).
-* Eclipse IDE for Java EE Developers (Helios (Eclipse 3.6.x) or Galileo (Eclipse 3.5.x))([http://www.eclipse.org/downloads/]).
-* Apache KARAF 2.2.x ([http://karaf.apache.org/index/community/download.html]);
+* Eclipse IDE Eclipse for RCP and RAP Developers ([http://www.eclipse.org/downloads/packages/release/indigo/sr2]).
+* Apache KARAF 2.2.x or 2.3.x ([http://karaf.apache.org/index/community/download.html]);
 
-Download and extract the Eclipse IDE for Java EE Developers archives to a directory of your choice (for e.g. $HOME/eclipse). 
+Download and extract the Eclipse IDE for RCP and RAP Developers archives to a directory of your choice (for e.g. $HOME/eclipse).
 The archive will be extracted to a directory named eclipse under the directory you specified (for e.g. $HOME/tools/eclipse/eclipse), referred to as *<eclipse_installation_dir>* from now on. 
 Make sure that the JDK in the PATH is Sun JDK 6.0. 
 Launch Eclipse by running <eclipse_installation_dir>/eclipse.