Author: dennisl
Date: Fri Jun 11 11:09:16 2010
New Revision: 953659
URL: http://svn.apache.org/viewvc?rev=953659&view=rev
Log:
The Windows batch file is called archiva.bat.
Merged from archiva-1.3.x branch.
Modified:
archiva/trunk/ (props changed)
archiva/trunk/archiva-docs/ (props changed)
archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt
archiva/trunk/archiva-docs/src/site/apt/quick-start.apt
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 11 11:09:16 2010
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025:721945-723577
/archiva/branches/MRM-541:686983-687034
+/archiva/branches/archiva-1.3.x:953645
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
/archiva/tags/archiva-1.3:898632
Propchange: archiva/trunk/archiva-docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 11 11:09:16 2010
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-docs:721945-723577
/archiva/branches/MRM-541/archiva-docs:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-docs:919292
+/archiva/branches/archiva-1.3.x/archiva-docs:919292,953645
/archiva/branches/archiva-search-improvements/archiva-docs:723609-726925
/archiva/branches/archiva-struts2/archiva-docs:699795-705848
/archiva/tags/archiva-1.3/archiva-docs:898632
Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt?rev=953659&r1=953658&r2=953659&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt Fri Jun
11 11:09:16 2010
@@ -13,7 +13,7 @@ Installing Standalone Distribution of Ap
Archiva can be run by executing:
- * <<<bin/archiva>>>, or <<<bin\archiva.bat>>> for windows (select the one
for your environment). The argument can be <<<console>>> to run
+ * <<<bin/archiva>>>, or <<<bin\archiva.bat>>> for Windows (select the one
for your environment). The argument can be <<<console>>> to run
interactively, or <<<start>>> to run in the background (in this case,
run the script with <<<stop>>> to later stop the server). The logs
are available in the <<<logs>>> directory where Archiva is installed.
@@ -24,7 +24,7 @@ Installing Standalone Distribution of Ap
On Windows, to use the <<<start>>> and <<<stop>>> commands you must first
install it as a service. This is done by running:
----
-.\bin\archiva install
+.\bin\archiva.bat install
----
You can then use the <<<start>>> and <<<stop>>> commands as well as the
traditional Windows service management console to manage the Archiva
@@ -36,7 +36,7 @@ Installing Standalone Distribution of Ap
You can later remove the service with:
----
-.\bin\archiva remove
+.\bin\archiva.bat remove
----
* Separating the base from the installation
Modified: archiva/trunk/archiva-docs/src/site/apt/quick-start.apt
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt?rev=953659&r1=953658&r2=953659&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/quick-start.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/quick-start.apt Fri Jun 11 11:09:16
2010
@@ -3,7 +3,7 @@
-----
Henri Yandell
-----
- 1 October 2006
+ 2010-06-11
-----
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -36,7 +36,7 @@ Installing Archiva
----
./bin/archiva console (Linux, Mac, Solaris)
-.\bin\archiva console (Windows)
+.\bin\archiva.bat console (Windows)
----
You will need to choose a different start command based on your platform.
The <<<console>>> argument
