aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-docs/src/site/apt/adminguide
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2017-03-21 21:26:51 +0100
committerMartin Stockhammer <martin_s@apache.org>2017-03-21 21:26:51 +0100
commite162e0a8db5a97a24566b14cad5e9e6aaed70a44 (patch)
tree09320e8e469e6b5142f0337080f182bbbd7c3454 /archiva-docs/src/site/apt/adminguide
parentc773e3835cd5885468884b87ab7d4877c8ab6bdf (diff)
downloadarchiva-e162e0a8db5a97a24566b14cad5e9e6aaed70a44.tar.gz
archiva-e162e0a8db5a97a24566b14cad5e9e6aaed70a44.zip
Adding additional documentation
Diffstat (limited to 'archiva-docs/src/site/apt/adminguide')
-rw-r--r--archiva-docs/src/site/apt/adminguide/webapp.apt6
-rw-r--r--archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm13
2 files changed, 13 insertions, 6 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt
index e035e37d3..91cec16f3 100644
--- a/archiva-docs/src/site/apt/adminguide/webapp.apt
+++ b/archiva-docs/src/site/apt/adminguide/webapp.apt
@@ -25,10 +25,10 @@
Installing Apache Archiva as a Web Application
-~~TODO: link to wiki location for other application servers
-
Archiva can be deployed as a web application into any Java EE application server. This document will show an
- example of doing so with Apache Tomcat 5.5, 6.0.x and 7.0.x
+ example of doing so with Apache Tomcat 5.5, 6.0.x and 7.0.x.
+
+ You can find information about additional application servers on {{{https://cwiki.apache.org/confluence/display/ARCHIVA/HOWTO+run+Archiva+on+your+Application+Server+or+Database} the archiva wiki}}.
<<Note>>: When you first start Archiva, you will see an Exception that schema SA does not exist - however it doesn't
cause a problem. If you use a username other than 'sa', such as 'archiva', then you seem to get the same error but
diff --git a/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm b/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm
index 874c3eaf2..0aedc6d49 100644
--- a/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm
+++ b/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm
@@ -38,6 +38,13 @@ Using REST Services
* Redback REST api is available here: {{http://archiva.apache.org/docs/${project.version}/rest-docs-redback-rest-api/index.html}}
+* Security related information
+
+ Starting with version 2.2.2 we added HTTP verification techniques to avoid cross site request forgery attacks. The
+ updating services check Origin and Referer header and use a token provided by the login service.
+ If you use the webservices with a native client that is no browser or want to allow requests from different origin
+ URLs you have to change the configuration. For further information see the {{{/redback/integration/rest.html}Redback REST documentation}}
+
* Search Service
Authentication headers for connect to your Archiva instance :
@@ -114,11 +121,11 @@ Using REST Services
Current versions use in Apache Archiva:
- * $\{project.version}: ${project.version}
+ * <<<$\{project.version}>>>: ${project.version}
- * $\{cxfVersion}: ${cxfVersion}
+ * <<<$\{cxfVersion}>>>: ${cxf.version}
- * $\{jacksonVersion}: ${jacksonVersion}
+ * <<<$\{jacksonVersion}>>>: ${jacksonVersion}
* Security Framework Services: