svn commit: r1140905 - in /servicemix/website/trunk/src/main/webapp: developers/source.page developers/source/ developers/source/website-source.page images/Fisheye_logo.png

[ge...@apache.org]

Author: gertv
Date: Tue Jun 28 23:27:37 2011
New Revision: 1140905

URL: http://svn.apache.org/viewvc?rev=1140905&view=rev
Log:
Add information about the website project to the new website contents

Added:
    servicemix/website/trunk/src/main/webapp/developers/source/
    servicemix/website/trunk/src/main/webapp/developers/source/website-source.page
    servicemix/website/trunk/src/main/webapp/images/Fisheye_logo.png
Modified:
    servicemix/website/trunk/src/main/webapp/developers/source.page

Modified: servicemix/website/trunk/src/main/webapp/developers/source.page
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/developers/source.page?rev=1140905&r1=1140904&r2=1140905&view=diff
==============================================================================
--- servicemix/website/trunk/src/main/webapp/developers/source.page (original)
+++ servicemix/website/trunk/src/main/webapp/developers/source.page Tue Jun 28 23:27:37 2011
@@ -2,82 +2,27 @@
 title: Source
 --- pipeline:conf
 
-{note}
-TODO: Update this page to reflect the multi-project subversion structure we have and to properly discriminate between ServiceMix 3.x, 4.x and 5.x subprojects and modules
-{note}
+At the Apache ServiceMix project, we are maintaining a few versions of ServiceMix, each of which has its own set of modules, components, ...
+The information on this page will show you where the source code lives for all these different bits and pieces, as well as provide you with instructions on how to build the projects.
 
+h2. ServiceMix 3.x
 
-h1. Apache ServiceMix Source Tree 
+//TODO: write something about this
 
-h2. Browsing the Source Tree 
+h2. ServiceMix 4.x
 
-h3. Web Browsing of SVN
+//TODO: write something about this
 
-To browse the raw SVN repo, use the following URL: 
+h2. ServiceMix 5.x
 
-{panel}
-http://svn.apache.org/repos/asf/servicemix/smx3/trunk/
-{panel}
+//TODO: write something about this
 
-To browse the SVN repo using [ViewVC|http://www.viewvc.org/], use the following URL: 
+h2. Documentation
 
-{panel}
-http://svn.apache.org/viewvc/servicemix/smx3/trunk/
-{panel}
-
-h3. Web Browsing of FishEye 
-
-!Fisheye_logo.png!
-
-A hearty thanks to [Atlassian|http://atlassian.com/] for providing [FishEye|http://www.atlassian.com/software/fisheye/] hosting for ServiceMix. Below is the URL to browse the Subversion repo via FishEye:
-
-{panel} 	 
-http://fisheye6.cenqua.com/browse/servicemix/
-{panel}
-
-h2. Checking out the Source Tree 
-
-h3. Anonymous Checkout from the ServiceMix SVN Repo
-
-This project's SVN repository can be checked out anonymously using the following command: 
-
-{code}
-svn co http://svn.apache.org/repos/asf/servicemix/smx3/trunk/
-{code}
-
-h3. Committer Checkout from the ServiceMix SVN Repo
-
-ServiceMix committers can check out using the following command: 
-
-{code}
-svn co https://svn.apache.org/repos/asf/servicemix/smx3/trunk
-{code}
-
-*Only project developers can commit to the SVN tree via this method. SSH must be installed on your client machine. Enter your site password when prompted.*
-
-h2. Building the Source Code
-
-Once you have checked out the source code please read the [instructions on how to build ServiceMix|Building].
-
-h2. Working With the ServiceMix Extensions at the Codehaus
-
-Due to license issues, some extensions to ServiceMix are hosted at the CodeHaus. To browse that SVN repo via the web, use the following URL: 
-
-{panel}
-http://svn.codehaus.org/servicemix/trunk/
-{panel}
-
-This project's SVN repository can be checked out anonymously with the following command: 
-
-{code}
-svn co http://svn.codehaus.org/servicemix/trunk
-{code}
-
-If you are a committer, use the following URL: 
-
-{code}
-svn co https://svn.codehaus.org/servicemix/trunk
-{code}
+//TODO: write something about this
 
+h2. [Website|website-source]
 
+We are also maintaining our website with Maven project, using [Scalate|http://scalate.fusesource.org/] to generate the pages from the source files.
 
+More information about the source code locations and how to build the website project, can be found [here|website-source].
\ No newline at end of file

Added: servicemix/website/trunk/src/main/webapp/developers/source/website-source.page
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/developers/source/website-source.page?rev=1140905&view=auto
==============================================================================
--- servicemix/website/trunk/src/main/webapp/developers/source/website-source.page (added)
+++ servicemix/website/trunk/src/main/webapp/developers/source/website-source.page Tue Jun 28 23:27:37 2011
@@ -0,0 +1,76 @@
+---
+title: Website Source
+--- pipeline:conf
+
+h1. Website Project
+
+h2. Browsing the Source Tree
+
+h3. Web Browsing of SVN
+
+To browse the raw SVN repo, use the following URL:
+
+{panel}
+http://svn.apache.org/repos/asf/servicemix/website/trunk/
+{panel}
+
+To browse the SVN repo using [ViewVC|http://www.viewvc.org/], use the following URL:
+
+{panel}
+http://svn.apache.org/viewvc/servicemix/website/trunk/
+{panel}
+
+h3. Web Browsing of FishEye
+
+!/images/Fisheye_logo.png!
+
+A hearty thanks to [Atlassian|http://atlassian.com/] for providing [FishEye|http://www.atlassian.com/software/fisheye/] hosting for ServiceMix. Below is the URL to browse the Subversion repo via FishEye:
+
+{panel}
+http://fisheye6.cenqua.com/browse/servicemix/website/
+{panel}
+
+h2. Checking out the Source Tree
+
+h3. Anonymous Checkout from the ServiceMix SVN Repo
+
+This project's SVN repository can be checked out anonymously using the following command:
+
+{code}
+svn co http://svn.apache.org/repos/asf/servicemix/website/trunk/
+{code}
+
+h3. Committer Checkout from the ServiceMix SVN Repo
+
+ServiceMix committers can check out using the following command:
+
+{code}
+svn co https://svn.apache.org/repos/asf/servicemix/website/trunk
+{code}
+
+*Only project developers can commit to the SVN tree via this method. SSH must be installed on your client machine. Enter your site password when prompted.*
+
+h2. Building a new website
+
+h3. A few words about the project structure
+
+This project looks like a regular Maven war project.  The source for the website pages are living in the {{src/main/webapp}} directory.  We don't intend to release this project, the main goal is just to upload the result of the build to http://servicemix.apache.org/staging
+
+h3. Build and browse locally
+
+In the root of the website project, run a {{mvn clean install}} to create a new copy of the website.  You can find the generated website in the {{target/sitegen}} folder.
+You can also run {{mvn jetty:run}} to have a live, browsable copy of the website available on your machine at http://localhost:8080 - this is very conventient for editing the website pages.
+
+h3. Upload a new copy
+
+If you're a committer, you can upload a new copy of the website into the staging area at http://servicemix.apache.org/staging by running a {{mvn scalate:deploy}}.
+
+Before you run this command, ensure to configure the {{people.apache.org}} server credentials in your {{~/.m2/settings.xml}}.
+
+{pygmentize:lang=xml}
+<server>
+  <id>people.apache.org</id>
+  <username>your_apache_user_name</username>
+  <password/> or <privateKey/>
+</server>
+{pygmentize}
\ No newline at end of file

Added: servicemix/website/trunk/src/main/webapp/images/Fisheye_logo.png
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/images/Fisheye_logo.png?rev=1140905&view=auto
==============================================================================
Files servicemix/website/trunk/src/main/webapp/images/Fisheye_logo.png (added) and servicemix/website/trunk/src/main/webapp/images/Fisheye_logo.png Tue Jun 28 23:27:37 2011 differ