From 9985c63e371f33b3dac54874dfaaea67b18ce3d1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 8 Dec 2012 14:11:18 +0000 Subject: [PATCH] Improve build and documentation git-svn-id: https://svn.argeo.org/commons/trunk@5921 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- doc/pom.xml | 16 ++--- .../commons-gettingStarted.xml | 0 doc/{src/docbkx => reference}/css/style.css | 0 doc/site/site.xml | 9 +-- pom.xml | 70 +++++++++++++------ 5 files changed, 58 insertions(+), 37 deletions(-) rename doc/{src/docbkx => reference}/commons-gettingStarted.xml (100%) rename doc/{src/docbkx => reference}/css/style.css (100%) diff --git a/doc/pom.xml b/doc/pom.xml index 3cc534411..5bf01e7f5 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -1,8 +1,9 @@ - + 4.0.0 org.argeo.commons - 0.3.5-SNAPSHOT + 1.1.8-SNAPSHOT argeo-commons .. @@ -14,7 +15,6 @@ com.agilejava.docbkx docbkx-maven-plugin - 2.0.8 css/style.css @@ -32,17 +32,9 @@ generate-html generate-pdf - compile + pre-site - - - org.docbook - docbook-xml - 4.4 - runtime - - diff --git a/doc/src/docbkx/commons-gettingStarted.xml b/doc/reference/commons-gettingStarted.xml similarity index 100% rename from doc/src/docbkx/commons-gettingStarted.xml rename to doc/reference/commons-gettingStarted.xml diff --git a/doc/src/docbkx/css/style.css b/doc/reference/css/style.css similarity index 100% rename from doc/src/docbkx/css/style.css rename to doc/reference/css/style.css diff --git a/doc/site/site.xml b/doc/site/site.xml index f639492b4..af6484f0e 100644 --- a/doc/site/site.xml +++ b/doc/site/site.xml @@ -23,10 +23,11 @@ - - - - + + + + + diff --git a/pom.xml b/pom.xml index 490e685d2..41566da45 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.commons argeo-commons @@ -8,10 +9,11 @@ Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring pom - 1.1 - 2012-06-19 + 1.1 + 2012-06-19

1.3.1

1.1.8-SNAPSHOT + 6 /srv/rpmfactory/argeo-osgi-staging/6/x86_64 @@ -26,11 +28,10 @@ Argeo http://www.argeo.org - ${site.urlBase}/${developmentCycle} + http://projects.argeo.org/commons/ scm:svn:https://svn.argeo.org/commons/trunk - scm:svn:https://svn.argeo.org/commons/trunk - + scm:svn:https://svn.argeo.org/commons/trunk https://svn.argeo.org/commons/trunk 2007 @@ -233,6 +234,11 @@ limitations under the License. maven-license-plugin 1.9.0 + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.14 + maven-site-plugin @@ -326,7 +332,7 @@ limitations under the License. date - ${developmentCycle.startDate} + ${developmentCycle.argeo-commons.startDate} yyyy-MM-dd @@ -436,6 +442,34 @@ limitations under the License. + + com.agilejava.docbkx + docbkx-maven-plugin + + doc/reference + target/site/reference + css/style.css + + + + + + + + + + + + + + + generate-html + generate-pdf + + pre-site + + + @@ -483,13 +517,13 @@ limitations under the License. staging - dav:https://repo.argeo.org/data/files/java/org.argeo.commons-1.1.x + dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x false site Argeo Commons Site - file:///srv/projects/www/commons/site/${project.version} + dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x @@ -499,13 +533,13 @@ limitations under the License. localrepo Internal Release Repository - dav:http://localrepo:7070/data/files/java/org.argeo.commons-1.1.x + dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x - - localrepo.snapshots - Internal Snapshot Repository - dav:http://localrepo:7070/data/files/java/org.argeo.commons-1.1.x - + + site + Argeo Commons Site + dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x + @@ -515,11 +549,5 @@ limitations under the License. /srv/rpmfactory/argeo-osgi-staging/5/x86_64 - - doc - - doc - - -- 2.30.2