From: Andreas Kohlbecker Date: Tue, 29 Jul 2014 12:41:37 +0000 (+0000) Subject: untracked files on mvc-java-config: 9847e2f fixing bugs, resolvin a conflict and... X-Git-Tag: cdmlib-parent-3.3.7~91 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/15eb2ebd338831fcb5bada1e43f827ff2a566f06 untracked files on mvc-java-config: 9847e2f fixing bugs, resolvin a conflict and cleaning up of ClassificationPortalListController, this changes the thre return type of the list method in the controller --- diff --git a/.gitattributes b/.gitattributes index 39c4f0f937..9ea197e5b9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1813,6 +1813,7 @@ cdmlib-remote-webapp/src/main/webapp/css/jquery-ui/images/ui-icons_888888_256x24 cdmlib-remote-webapp/src/main/webapp/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png -text cdmlib-remote-webapp/src/main/webapp/css/jquery-ui/jquery-ui-1.8.23.custom.css -text cdmlib-remote-webapp/src/main/webapp/csv/csvExport.jsp -text +cdmlib-remote-webapp/src/main/webapp/index.html -text cdmlib-remote-webapp/src/main/webapp/js/cdm_ws_progress.js -text cdmlib-remote-webapp/src/main/webapp/js/csv_export.js -text cdmlib-remote-webapp/src/main/webapp/js/jquery-1.7.2.min.js -text diff --git a/cdmlib-remote-webapp/src/main/webapp/index.html b/cdmlib-remote-webapp/src/main/webapp/index.html new file mode 100644 index 0000000000..7095c8a27d --- /dev/null +++ b/cdmlib-remote-webapp/src/main/webapp/index.html @@ -0,0 +1,25 @@ + + + + +CDM Remote API + + +

CDM Remote API

+

This is the root of the CDM remote web application which offers + the following APIs.

+

RESTful API

+ +

OAI-PMH

+ +

RESTful API

+ + + \ No newline at end of file