From fb43b1972ebf400f4e555e9bbcf69d27bf5c2724 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Sep 2012 19:13:33 +0000 Subject: [PATCH] ability to work offline when writing documentation see DOXIA-478 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1383059 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-docs/pom.xml | 26 +++++++++++++++++++ .../apt/adminguide/customising-security.apt | 2 +- .../repositories-content-storage.apt | 4 +-- .../apt/adminguide/webservices/rest.apt.vm | 16 ++++++------ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 3cff952fe..692e046a8 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -146,5 +146,31 @@ + + offline + + + offline + true + + + + + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.doxia + doxia-core + 1.4-SNAPSHOT + + + + + + + diff --git a/archiva-docs/src/site/apt/adminguide/customising-security.apt b/archiva-docs/src/site/apt/adminguide/customising-security.apt index 3ed7961b0..ec3846069 100644 --- a/archiva-docs/src/site/apt/adminguide/customising-security.apt +++ b/archiva-docs/src/site/apt/adminguide/customising-security.apt @@ -74,7 +74,7 @@ security.policy.password.rule.nowhitespace.enabled=true Values from sources -%{snippet|id=configuration-files-list|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml} +%{snippet|id=configuration-files-list|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml} diff --git a/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt b/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt index fc2f58471..fee2bce51 100644 --- a/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt +++ b/archiva-docs/src/site/apt/adminguide/repositories-content-storage.apt @@ -32,7 +32,7 @@ Repositories Content Storage A default Jackrabbit configuration is provided : -%{snippet|id=default-repository|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml} +%{snippet|id=default-repository|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml} You can use your own configuration by adding a file repository.xml in $\{appserver.base}/conf. @@ -40,4 +40,4 @@ Repositories Content Storage If you want to change this default location, you must edit the file WEB-INF/applicationContext.xml, uncomment/edit lines and change with your values: -%{snippet|id=jcr-location|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml} \ No newline at end of file +%{snippet|id=jcr-location|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml} \ No newline at end of file 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 f75437eb8..2f649a46c 100644 --- a/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm +++ b/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm @@ -36,42 +36,42 @@ Using REST Services Authentication headers for connect to your Archiva instance : -%{snippet|id=authz-header|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java} +%{snippet|id=authz-header|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java} Get a Search Service Client : -%{snippet|id=cxf-searchservice-creation|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java} +%{snippet|id=cxf-searchservice-creation|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java} Quick Search -%{snippet|id=quick-search|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} +%{snippet|id=quick-search|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} Search Artifacts Version : to search all availables version with a groupId and artifactId and packaging (if empty jar is used) -%{snippet|id=searchservice-artifact-versions|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} +%{snippet|id=searchservice-artifact-versions|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} Search Service with a classifier : -%{snippet|id=searchservice-with-classifier|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} +%{snippet|id=searchservice-with-classifier|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} Search Service with a classifier : -%{snippet|id=searchservice-with-classifier|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} +%{snippet|id=searchservice-with-classifier|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java} Copy Artifact from a repository to an other one : For some reasons you want to use a test repository before moving your artifacts to a repository used by final users. To achieve this, you can use a service which can copy an artifact from a repository to an other one -%{snippet|id=copy-artifact|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java} +%{snippet|id=copy-artifact|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java} To know all the possible options, you can refer to the javadoc of SearchRequest class. Dependencies to add in order to use those REST Services -%{snippet|id=rest-dependencies|url=https://svn.apache.org/repos/asf/archiva/trunk/pom.xml} +%{snippet|id=rest-dependencies|ignoreDownloadError=true|url=https://svn.apache.org/repos/asf/archiva/trunk/pom.xml} Current versions use in Apache Archiva: -- 2.39.5