Tweak miredot configuration so that the generate-site scripts can work 
properly. Added link to REST API documentation.


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3db8bc69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3db8bc69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3db8bc69

Branch: refs/heads/master
Commit: 3db8bc69e117e8ef2f198a1de99cae454591ae4b
Parents: 4a87c7d
Author: Chris Laprun <[email protected]>
Authored: Fri Nov 20 17:56:27 2015 +0100
Committer: Chris Laprun <[email protected]>
Committed: Fri Nov 20 17:56:27 2015 +0100

----------------------------------------------------------------------
 generate-site-and-upload.sh | 3 +++
 generate-site.sh            | 3 +++
 rest/pom.xml                | 2 +-
 src/site/site.xml           | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3db8bc69/generate-site-and-upload.sh
----------------------------------------------------------------------
diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh
index de5b530..05ddd1a 100755
--- a/generate-site-and-upload.sh
+++ b/generate-site-and-upload.sh
@@ -19,6 +19,9 @@
 
################################################################################
 echo Generating site...
 mvn clean install site site:stage -P integration-tests,performance-tests
+cd rest
+mvn package
+cd -
 echo Committing site to Apache SVN...
 mvn scm-publish:publish-scm
 echo Site generation and upload completed.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3db8bc69/generate-site.sh
----------------------------------------------------------------------
diff --git a/generate-site.sh b/generate-site.sh
index 321f54d..b5867bb 100755
--- a/generate-site.sh
+++ b/generate-site.sh
@@ -19,3 +19,6 @@
 
################################################################################
 echo Generating site...
 mvn site site:stage -P integration-tests,performance-tests
+cd rest
+mvn package
+cd -

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3db8bc69/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 3ec17d8..2450594 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -191,7 +191,7 @@
                         <title>Documentation for Apache Unomi's RESTful API 
${project.version}</title>
                         <html>
                             <!-- optional html configuration -->
-                            
<location>${project.parent.build.directory}/site/rest-api-doc</location>
+                            
<location>${project.parent.build.directory}/staging/rest-api-doc</location>
                         </html>
                         <raml></raml>
                     </output>

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3db8bc69/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9fdd3dc..5655feb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -102,7 +102,7 @@
             <item name="Configuration" href="configuration.html" />
             <item name="Cluster setup" href="clustering.html" />
             <item name="Concepts" href="concepts.html"/>
-            <!--<item name="REST API documentation" 
href="./unomi-rest/rest-api-doc/index.html"/>-->
+            <item name="REST API documentation" 
href="./rest-api-doc/index.html"/>
             <item name="API Javadoc" href="./unomi-api/apidocs/index.html"/>
         </menu>
 

Reply via email to