Author: olamy
Date: Thu Dec 27 15:03:47 2012
New Revision: 1426219
URL: http://svn.apache.org/viewvc?rev=1426219&view=rev
Log:
fix doc due to renamed modules
Modified:
archiva/site/src/site/apt/developers/building.apt
archiva/site/src/site/apt/developers/how-we-do-things.apt.vm
archiva/site/src/site/apt/developers/releasing.apt
archiva/site/src/site/xdoc/jsui/index.xml
Modified: archiva/site/src/site/apt/developers/building.apt
URL:
http://svn.apache.org/viewvc/archiva/site/src/site/apt/developers/building.apt?rev=1426219&r1=1426218&r2=1426219&view=diff
==============================================================================
--- archiva/site/src/site/apt/developers/building.apt (original)
+++ archiva/site/src/site/apt/developers/building.apt Thu Dec 27 15:03:47 2012
@@ -37,8 +37,8 @@ Building Archiva
[]
- After the build completes, you can find the Archiva distribution in
<<<archiva-jetty/target>>>/<<<archiva-jetty-js/target>>> and the Archiva
- webapp in
<<<archiva-modules/archiva-web/archiva-webapp/target>>>/<<<archiva-modules/archiva-web/archiva-webapp-js/target>>>.
+ After the build completes, you can find the Archiva distribution in
<<<archiva-jetty/target>>> and the Archiva
+ webapp in <<<archiva-modules/archiva-web/archiva-webapp/target>>>
Usually, it's that simple. :) Occasionally, Archiva may depend on a snapshot
of another project such as
@@ -80,9 +80,9 @@ Running Javascript webapp with tomcat-ma
With maven3 in the top directory :
+--
-mvn tomcat7:run -pl :archiva-webapp-js -am
+mvn tomcat7:run -pl :archiva-webapp -am
or
-mvn tomcat6:run -pl :archiva-webapp-js -am
+mvn tomcat6:run -pl :archiva-webapp -am
or
sh ./t7.sh
+--
Modified: archiva/site/src/site/apt/developers/how-we-do-things.apt.vm
URL:
http://svn.apache.org/viewvc/archiva/site/src/site/apt/developers/how-we-do-things.apt.vm?rev=1426219&r1=1426218&r2=1426219&view=diff
==============================================================================
--- archiva/site/src/site/apt/developers/how-we-do-things.apt.vm (original)
+++ archiva/site/src/site/apt/developers/how-we-do-things.apt.vm Thu Dec 27
15:03:47 2012
@@ -37,7 +37,7 @@ How We Do Things
You can test fresh builds with downloading from this Jenkins job
{{{https://builds.apache.org/view/A-F/view/Archiva/job/archiva-all-maven-3.x-jdk-1.6/}archiva-all-maven-3.x-jdk-1.6}}:
- *
{{{https://builds.apache.org/view/A-F/view/Archiva/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-modules/archiva-web/archiva-webapp-js/target/archiva-webapp-js-${archivaCurrentDevVersion}.war}war
webapp js}}
+ *
{{{https://builds.apache.org/view/A-F/view/Archiva/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-modules/archiva-web/archiva-webapp/target/archiva-webapp-${archivaCurrentDevVersion}.war}war
webapp js}}
*
{{{https://builds.apache.org/view/A-F/view/Archiva/job/archiva-all-maven-3.x-jdk-1.6/lastSuccessfulBuild/artifact/archiva-jetty/target/apache-archiva-js-${archivaCurrentDevVersion}-bin.zip}standalone
with embeded jetty}} (unzip then cd bin;./archiva start running on 8080)
Modified: archiva/site/src/site/apt/developers/releasing.apt
URL:
http://svn.apache.org/viewvc/archiva/site/src/site/apt/developers/releasing.apt?rev=1426219&r1=1426218&r2=1426219&view=diff
==============================================================================
--- archiva/site/src/site/apt/developers/releasing.apt (original)
+++ archiva/site/src/site/apt/developers/releasing.apt Thu Dec 27 15:03:47 2012
@@ -81,7 +81,7 @@ gpg -v archiva-jetty-1.3-bin.zip.asc
+-------------
The documentation is deployed as part of the process to the final location
for review in the vote: http://archiva.apache.org/docs/1.3/. If the vote
doesn't pass, the documentation will need to be removed from the server for
redeployment.
- Commit the sources and binaries from org/apache/archiva/archiva-jetty,
org/apache/archiva/archiva-jetty-js and org/apache/archiva/archiva to the svn
distribution tree.
+ Commit the sources and binaries from org/apache/archiva/archiva-jetty, and
org/apache/archiva/archiva to the svn distribution tree.
First in dev tree: https://dist.apache.org/repos/dist/dev/archiva/ (if the
vote pass they will be copied to release tree)
https://dist.apache.org/repos/dist/release/archiva
+-------------
Modified: archiva/site/src/site/xdoc/jsui/index.xml
URL:
http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/jsui/index.xml?rev=1426219&r1=1426218&r2=1426219&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/jsui/index.xml (original)
+++ archiva/site/src/site/xdoc/jsui/index.xml Thu Dec 27 15:03:47 2012
@@ -81,7 +81,7 @@
</subsection>
<subsection name="Sources organisation">
<p>
- Sources are located in <a target="_blank"
href="http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/";>src/main/webapp</a>
:
+ Sources are located in <a target="_blank"
href="http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/";>src/main/webapp</a>
:
<ul>
<li>css</li>
<li>images</li>
