summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js16
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js6
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html1
-rw-r--r--pom.xml2
4 files changed, 24 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
index 4dcd8e8a2..4ee4c0052 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
@@ -52,6 +52,22 @@ define("archiva.docs",["jquery","i18n","jquery.tmpl","bootstrap"], function() {
});
}
+ goToRedbackRestDoc=function(target){
+ $("#main-content" ).html(mediumSpinnerImg());
+ $.ajax({
+ url:"rest-docs/rest-docs-redback-rest-api/"+target,
+ type:"get",
+ dataType: "html",
+ success: function(data){
+ $("#main-content" ).html($("#rest_docs").tmpl());
+ $("#main-content" ).find("#rest_docs_content" ).html(data);
+ prettyPrint();
+ }
+ });
+ }
+ displayRedbackRestDocs=function(){
+ window.sammyArchivaApplication.setLocation("#rest-docs-redback-rest-api/index.html");
+ }
displayArchivaRestUIDocs=function(){
window.sammyArchivaApplication.setLocation("#rest-docs-archiva-ui/index.html");
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index 712f6ce7d..c6caa52ee 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -643,6 +643,12 @@ function(jquery,ui,sammy,tmpl) {
goToArchivaRestUiDoc(target);
});
+ this.get("#rest-docs-redback-rest-api/:target",function(){
+ var target=this.params.target;
+ $.log("redback-rest-docs, target:"+target);
+ goToRedbackRestDoc(target);
+ });
+
});
};
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
index b03cb0b30..13a7fd856 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
@@ -26,6 +26,7 @@
<ul>
<li><a onclick="displayArchivaRestDocs();">Archiva Rest Api Docs</a></li>
<li><a onclick="displayArchivaRestUIDocs();">Archiva Rest Api UI Docs</a></li>
+ <li><a onclick="displayRedbackRestDocs();">Redback Rest Api UI Docs</a></li>
</ul>
</div>
</div>
diff --git a/pom.xml b/pom.xml
index f55d7e0bd..9a978d447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<maven-model-converter.version>2.1</maven-model-converter.version>
<maven.indexer.version>5.0.0</maven.indexer.version>
<wagon.version>2.2</wagon.version>
- <redback.version>2.0</redback.version>
+ <redback.version>2.1-SNAPSHOT</redback.version>
<redback.cache.version>2.0</redback.cache.version>
<redback.quartz.version>2.0</redback.quartz.version>
<redback.registry.version>2.0</redback.registry.version>