Author: olamy
Date: Fri Oct 5 15:48:08 2012
New Revision: 1394607
URL: http://svn.apache.org/viewvc?rev=1394607&view=rev
Log:
add rest doc for ui services
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml
- copied, changed from r1394555,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java
(contents, props changed)
- copied, changed from r1394555,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/docs/RestDocsServlet.java
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/docs/RestDocsServlet.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1394607&r1=1394606&r2=1394607&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Fri Oct
5 15:48:08 2012
@@ -40,6 +40,8 @@
<archiva.baseRestUrl />
<rest.admin.pwd />
<test.useTomcat>false</test.useTomcat>
+
<enunciate.docsDir>${project.build.outputDirectory}/rest-docs-archiva-ui</enunciate.docsDir>
+
</properties>
<dependencies>
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml
(from r1394555,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html&r1=1394555&r2=1394607&rev=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml
Fri Oct 5 15:48:08 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -15,23 +16,28 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
--->
+ -->
+<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd";>
-<script id="rest_docs" type="text/html">
- <div>
- <div class="page-header">
- <div><b>${$.i18n.prop('docs.rest.header')}</b></div>
- </div>
- <div id="docs_rest_choice">
- <ul>
- <li><a onclick="displayArchivaRestDocs();">Archiva Rest Api
Docs</a></li>
- </ul>
- </div>
- </div>
- <div id="rest_docs_content">
- </div>
-</script>
-
-<script id="users_docs" type="text/html">
- rest docs
-</script>
\ No newline at end of file
+ <services>
+ <rest defaultRestSubcontext="archivaUiServices"/>
+ </services>
+
+ <modules>
+
+ <cxf disabled="false"/>
+ <jersey disabled="true" />
+ <c disabled="true"/>
+ <csharp disabled="true"/>
+ <obj-c disabled="true"/>
+ <jaxws-ri disabled="true"/>
+ <jaxws-support disabled="true"/>
+
+ <docs disabled="false" title="Apache Archiva UI REST API"
includeExampleXml="true" includeExampleJson="true"
+ includeDefaultDownloads="false">
+ <war docsDir="apidocs" />
+ </docs>
+
+ </modules>
+
+</enunciate>
\ No newline at end of file
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java
(from r1394555,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/docs/RestDocsServlet.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/docs/RestDocsServlet.java&r1=1394555&r2=1394607&rev=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/docs/RestDocsServlet.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java
Fri Oct 5 15:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.archiva.rest.docs;
+package org.apache.archiva.webapp.ui.services.docs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml?rev=1394607&r1=1394606&r2=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
Fri Oct 5 15:48:08 2012
@@ -81,7 +81,7 @@
<servlet>
<servlet-name>RestDocumentation</servlet-name>
- <servlet-class>org.apache.archiva.rest.docs.RestDocsServlet</servlet-class>
+
<servlet-class>org.apache.archiva.webapp.ui.services.docs.RestDocsServlet</servlet-class>
<load-on-startup>3</load-on-startup>
</servlet>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js?rev=1394607&r1=1394606&r2=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js
Fri Oct 5 15:48:08 2012
@@ -38,6 +38,25 @@ define("archiva.docs",["jquery","i18n","
});
}
+ goToArchivaRestUiDoc=function(target){
+ $("#main-content" ).html(mediumSpinnerImg());
+ $.ajax({
+ url:"rest-docs/rest-docs-archiva-ui/"+target,
+ type:"get",
+ dataType: "html",
+ success: function(data){
+ $("#main-content" ).html($("#rest_docs").tmpl());
+ $("#main-content" ).find("#rest_docs_content" ).html(data);
+ prettyPrint();
+ }
+ });
+ }
+
+
+ displayArchivaRestUIDocs=function(){
+
window.sammyArchivaApplication.setLocation("#rest-docs-archiva-ui/index.html");
+ }
+
displayArchivaRestDocs=function(){
window.sammyArchivaApplication.setLocation("#rest-docs-archiva-rest-api/index.html");
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1394607&r1=1394606&r2=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Fri Oct 5 15:48:08 2012
@@ -637,6 +637,12 @@ function(jquery,ui,sammy,tmpl) {
goToArchivaRestDoc(target);
});
+ this.get("#rest-docs-archiva-ui/:target",function(){
+ var target=this.params.target;
+ $.log("archiva-rest-docs-ui, target:"+target);
+ goToArchivaRestUiDoc(target);
+ });
+
});
};
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html?rev=1394607&r1=1394606&r2=1394607&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
Fri Oct 5 15:48:08 2012
@@ -25,6 +25,7 @@
<div id="docs_rest_choice">
<ul>
<li><a onclick="displayArchivaRestDocs();">Archiva Rest Api
Docs</a></li>
+ <li><a onclick="displayArchivaRestUIDocs();">Archiva Rest Api UI
Docs</a></li>
</ul>
</div>
</div>
@@ -33,5 +34,4 @@
</script>
<script id="users_docs" type="text/html">
- rest docs
</script>
\ No newline at end of file
