svn commit: r1586179 - in /archiva/site-content: developers/building.html developers/publishing-site.html jsui/index.html

[ol...@apache.org]

Author: olamy
Date: Thu Apr 10 00:10:15 2014
New Revision: 1586179

URL: http://svn.apache.org/r1586179
Log:
Apache Archiva Main site deployment

Modified:
    archiva/site-content/developers/building.html
    archiva/site-content/developers/publishing-site.html
    archiva/site-content/jsui/index.html

Modified: archiva/site-content/developers/building.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/building.html?rev=1586179&r1=1586178&r2=1586179&view=diff
==============================================================================
--- archiva/site-content/developers/building.html (original)
+++ archiva/site-content/developers/building.html Thu Apr 10 00:10:15 2014
@@ -227,13 +227,7 @@
 <p>The version-specific documentation for the latest version of Archiva can be found in <tt>archiva/archiva-docs</tt>, and the top-level Archiva website --including the page you're reading now -- is in the <tt>site</tt> directory.</p>
 <p>To work on the documentation, execute <tt>mvn site:run</tt> in one of these directories, and then visit http://localhost:8080 to view pages as you edit them. When you're done, submit a patch in the <a href="../issue-tracking.html">issue tracker</a>.</p></div>
 <div class="section">
-<h2>svn<a name="svn"></a></h2>
-<p>You use checkout all trunks.</p>
-<div class="source">
-<pre>svn co https://svn.apache.org/repos/asf/archiva/all archiva-all</pre></div></div>
-<div class="section">
 <h2>git clone<a name="git_clone"></a></h2>
-<p>You can use git svn clone. See <a class="externalLink" href="http://git.apache.org/">Apache Documentation</a>.</p>
 <div class="source">
 <pre>git clone git://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh
 or trough https

Modified: archiva/site-content/developers/publishing-site.html
URL: http://svn.apache.org/viewvc/archiva/site-content/developers/publishing-site.html?rev=1586179&r1=1586178&r2=1586179&view=diff
==============================================================================
--- archiva/site-content/developers/publishing-site.html (original)
+++ archiva/site-content/developers/publishing-site.html Thu Apr 10 00:10:15 2014
@@ -217,10 +217,10 @@
 <p>The Archiva site, documentation and reference documentation are now published to <tt>http://archiva.apache.org/</tt> using the <a class="externalLink" href="http://www.apache.org/dev/project-site.html#svnpubsub"> ASF's svnpubsub</a> service.</p>
 <p>The files published to the site are all stored under the Subversion repository at <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/site-content/">http://svn.apache.org/repos/asf/archiva/site-content/</a>.</p>
 <p>This mostly operates like a normal site deployment, though there are some specific customisations and special instructions for the reference library. The processes follow those described for the <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/">Maven SCM Publish Plugin</a> for <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html"> Single module projects</a> and <a class="externalLink" href="http://maven.apache.org/plugins/maven-scm-publish-plugin/examples/multi-module-configuration.html"> Multi-module projects</a> as applicable.</p>
-<p>Each site checks out the production site data into the <tt>site-publish</tt> directory of the current project, to avoid being cleaned as part of the build. It is ignored by <tt>svn</tt> operations, but you should ensure that the checkout is clean if you ever cancel or have a failure during a publish operation. You can check it is clean by ensuring there is no data from <tt>svn status</tt> in that directory, or by removing it and having it get checked out again.</p>
+<p>Each site checks out the production site data into the <tt>site-publish</tt> directory of the current project, to avoid being cleaned as part of the build. It is ignored by <tt>svn</tt> operations, but you should ensure that the checkout is clean if you ever cancel or have a failure during a publish operation. You can check it is clean by ensuring there is no data from <tt>git status</tt> in that directory, or by removing it and having it get checked out again.</p>
 <div class="section">
 <h3>Editing and Publishing the Main Site<a name="Editing_and_Publishing_the_Main_Site"></a></h3>
-<p>The site displayed at the root of <a class="externalLink" href="http://archiva.apache.org">http://archiva.apache.org</a> (where you are reading this) has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/site">https://svn.apache.org/repos/asf/archiva/site</a>.</p>
+<p>The site displayed at the root of <a class="externalLink" href="http://archiva.apache.org">http://archiva.apache.org</a> (where you are reading this) has its source code in Git at <a class="externalLink" href="https://git-wip-us.apache.org/repos/asf/archiva-site.git">https://git-wip-us.apache.org/repos/asf/archiva-site.git</a>.</p>
 <p>To edit and publish the site, do the following:</p>
 <ol style="list-style-type: decimal">
 <li>Checkout the source code from Subversion (if you follow the instructions in <a href="./building.html"> Building Archiva</a>, you will already have it.</li>
@@ -233,7 +233,7 @@
 <p>Note that since the main site also contains the (large!) <tt>docs</tt> and <tt>ref</tt> directories in the <tt>site-publish</tt> directory, there is a special <tt>setup-checkout</tt> profile in place to get the initial checkout without those directories. This will normally be activated whenever the <tt>site-publish</tt> directory is missing - if you happen to have active profiles from your <tt>settings.xml</tt> you may need to enable it explicitly whenever you do a deployment and that checkout is missing: <tt>mvn site-deploy -Psetup-checkout</tt> </p></div>
 <div class="section">
 <h3>Editing and Publishing the Archiva Documentation<a name="Editing_and_Publishing_the_Archiva_Documentation"></a></h3>
-<p>The documentation displayed under the subdirectories of <a class="externalLink" href="http://archiva.apache.org/docs/">http://archiva.apache.org/docs/</a> has its source code in Subversion at <a class="externalLink" href="https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs">https://svn.apache.org/repos/asf/archiva/trunk/archiva-docs</a>, which is part of the main project checkout.</p>
+<p>The documentation displayed under the subdirectories of <a class="externalLink" href="http://archiva.apache.org/docs/">http://archiva.apache.org/docs/</a> has its source code in Git at <a class="externalLink" href="https://git-wip-us.apache.org/repos/asf/archiva.git">https://git-wip-us.apache.org/repos/asf/archiva.git</a> directory archiva-docs, which is part of the main project checkout.</p>
 <p>The instructions for managing the documentation is the same as for the main site, being published from the directory using:</p>
 <div>
 <pre>mvn site-deploy</pre></div>

Modified: archiva/site-content/jsui/index.html
URL: http://svn.apache.org/viewvc/archiva/site-content/jsui/index.html?rev=1586179&r1=1586178&r2=1586179&view=diff
==============================================================================
--- archiva/site-content/jsui/index.html (original)
+++ archiva/site-content/jsui/index.html Thu Apr 10 00:10:15 2014
@@ -324,7 +324,7 @@
 <h3>Sources organisation<a name="Sources_organisation"></a></h3>
         
 <p>
-          Sources are located in <a class="externalLink" href="http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/" target="_blank">src/main/webapp</a> :
+          Sources are located in src/main/webapp of the archiva-webapp module :
           </p>
 <ul>