--- hippo-collab/trunk/README	2010/05/04 10:29:08	22649
+++ hippo-collab/trunk/README	2010/05/04 10:39:02	22650
@@ -9,102 +9,28 @@
 2. Requirements --
 
   (1) Java 1.5
-  (2) Maven 2.0.9
-  (3) Tomcat 6.x
-     --> You should install Tomcat 6.x into a folder to deploy Hippo Collab Portal.
+  (2) Maven 2.0.10 or Maven 2.2.1
 
 3. Building prerequisites
 
-  (1) Check out and build apa-webcontent-1.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/applications/webcontent/trunk
-
-  (2) Check out and build apa-gems-1.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/applications/gems/trunk
-
-  (3) Check out and build apa-rss-1.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/applications/rss/trunk
-
-  (4) Check out and build apa-demo-1.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/applications/demo/trunk
-
-  (5) Check out and build Pluto-2.0.1-SNAPSHOT from the following URL:
-  
-        https://svn.apache.org/repos/asf/portals/pluto/trunk
-    
-  (6) Check out and build Jetspeed-2.2.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk
-  
-  (7) Check out and build J2-ADMIN-2.2.1-SNAPSHOT from the following URL:
-        
-        http://svn.apache.org/repos/asf/portals/jetspeed-2/applications/j2-admin/trunk
-  
-  (8) Check out and build HST-2 from the following trunk scm URL:
+  (1) Check out and build HST-2 from the following trunk scm URL:
         
         https://svn.hippocms.org/repos/hippo/ecm/site-toolkit/trunk
 
-4. Configuring Build
-
-  (1) Create your own build configuration file
-      by copying "jetspeed-mvn-settings.xml.sample" to "jetspeed-mvn-settings.xml" in the project root folder.
-  
-  (2) Edit your "jetspeed-mvn-settings.xml":
-      
-      - Change the following property to set the correct path of your local TOMCAT installation path:
-      
-        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-6.0.20/</org.apache.jetspeed.server.home>
-      
-      - Optionally, you can change the database settings in your "jetspeed-mvn-settings.xml".
-        However, you don't have to, in most demonstration uses, because it initializes derby portal database automatically.
-
-5. Doing Build
+4. Doing Build
   
   $ mvn clean install
   
-6. Deploying
-  
-  $ mvn org.apache.portals.jetspeed-2:jetspeed-mvn-maven-plugin:2.2.1-SNAPSHOT:mvn -Dtarget=all
-  
-    (You can simplify the above command like this: "mvn jetspeed:mvn -Dtarget=all".
-     Please refer to http://portals.apache.org/jetspeed-2/buildguide/index.html for details.)
-     
-  
-7. Running your Tomcat 6.x.
-
-  NOTE: You must set 'emptySessionPath="true"' in the $CATALINA_HOME/conf/server.xml like the following example!!!
-      
-      <!-- N.B. the attribute names are case-sensitive! -->
-      
-      <Connector port="8080" protocol="HTTP/1.1" 
-               connectionTimeout="20000" 
-               redirectPort="8443"
-               emptySessionPath="true" />
-      
+5. Running
 
-  Now, you can run the Hippo Collab Portal by starting your Tomcat 6.x.
+  -- In a console,
   
-  (1) You can visit portal: http://localhost:8080/collab/
-  (2) You can visit cms by http://localhost:8080/cms/main/ (with ending slash)
-  (3) You can visit cms console by http://localhost:8080/cms/console/ (with ending slash)
-  (4) You can visit repository console by http://localhost:8080/cms/repository/ (with ending slash)
-  (5) You can visit wiki HST-2 site application by http://localhost:8080/wiki/preview/ or http://localhost:8080/wiki/.
-
-8. Deploying using MySQL database for the Repository/CMS
-
-  If you want to use a MySQL database for the Repository instead of the default embedded Derby database
-  then fill in/adjust at least the following properties defined in your local jetspeed-mvn-settings.xml:
+    $ cd cms
+    $ mvn jetty:run-war
   
-    org.onehippo.portal.collab.repository.database.user
-    org.onehippo.portal.collab.repository.database.password
-    org.onehippo.portal.collab.repository.directory
+  -- In another console,
     
-  Then, instead of using the -Dtarget=all parameter as shown in step 6., use -Dtarget=all-cms-mysql
-  Or, you can even switch from Derby to MySQL (so after doing step 6.) using -Dtarget=deploy-cms-mysql
- 
-  Note: if you want to switch back from MySQL to Derby, you'll have to delete the file $TOMCAT_HOME/conf/Catalina/localhost/cms.xml
-  manually before starting tomcat again!
-   
\ No newline at end of file
+    $ cmd site
+    $ mvn jetty:run
+  
+  Visit http://localhost:8085/site/