Merge branch 'master' of https://code.google.com/p/plexi.wiki
diff --git a/GettingStarted.wiki b/GettingStarted.wiki
index 98cc05d..1b94845 100644
--- a/GettingStarted.wiki
+++ b/GettingStarted.wiki
@@ -6,24 +6,25 @@
The Plexi Project is a library used to develop custom adaptors for both public and secure repositories. A Plexi adaptor provides documents to the Google Search Appliance (GSA). This document helps you setup a development environment with the source code of this library.
+= Building the library =
-= Setup Command Line Development Environment =
+Since there has yet to be a release, you are required to obtain the adaptor library sources using [http://git-scm.com/ Git] and build the project with [http://ant.apache.org/ Ant] and JDK 1.6 or higher.
-You will need a JDK 1.6u27 or higher, Ant, and Git to begin making use of the code. You can get a copy of this library by using this command:
+To build the adaptor library from the command line:
{{{
git clone https://code.google.com/p/plexi/
+cd plexi
+ant dist
}}}
-The !JavaDoc-based documentation has additional steps to get running: http://wiki.plexi.googlecode.com/git/plexi-javadoc/index.html . You can generate your own local copy of this documentation by running "ant javadoc" in the plexi directory and then opening "build/javadoc/index.html" in your browser.
+If the steps were successful, then {{{dist/adaptor.jar}}} should contain a JAR that you can use for your own adaptor development.
-Using JRE or JDK 1.6u27 or higher is very important, because there is a [http://bugs.sun.com/view_bug.do?bug_id=6946825 bad memory leak] in 1.6u16 and prior. When only using HTTP the leak isn't severe, but when using HTTPS the leak becomes very apparent.
+= Making and running your first adaptor =
+To run the adaptor library, you need JRE 1.6u27 or higher. Using JRE 1.6u27 or higher is very important, because there is a [http://bugs.sun.com/view_bug.do?bug_id=6946825 bad memory leak] in 1.6u26 and prior. When only using HTTP the leak isn't severe, but when using HTTPS the leak becomes very apparent.
-= Setup !NetBeans Development Environment =
+The [http://hourly.plexi.googlecode.com/git/javadoc/index.html JavaDoc-based documentation] describes how to begin development on your adaptor. To help get started understanding Plexi view our [http://code.google.com/p/plexi/source/browse/#git%2Fsrc%2Fcom%2Fgoogle%2Fenterprise%2Fadaptor%2Fexamples example adaptor sources].
-To setup using !NetBeans IDE please follow this visually annotated guide: http://wiki.plexi.googlecode.com/git/plexi-netbeans/nb.html
+= Developing the Adaptor library =
-
-= Source Files of Example Adaptors =
-
-To help get started understanding Plexi view our example adaptor sources: http://code.google.com/p/plexi/source/browse/#git%2Fsrc%2Fadaptorlib%2Fexamples
\ No newline at end of file
+If you are interested in adding features to the adaptor library itself, you may want to setup an IDE to aid development. For !NetBeans, you can follow the [http://wiki.plexi.googlecode.com/git/plexi-netbeans/nb.html visually annotated guide].
\ No newline at end of file
