Author: mattmann
Date: Sat Aug 22 05:14:30 2015
New Revision: 1697075
URL: http://svn.apache.org/r1697075
Log:
OODT-824: WIP: port Curator to Wicket
- resolve CSS and JS
- pare down all JS and CSS to necessities
- confirm services working from extraction to ingestion
- update webapp context properties
TODO:
refactor FileTree into oodt-webapp-components
handle SSO/login
handle breadcrumbs
Added:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.css
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree_wicket.css
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/jquery.alerts.js
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/
- copied from r1663022,
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/config/
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.css
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.html
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
oodt/trunk/curator/src/main/webapp/META-INF/context.xml
oodt/trunk/curator/src/main/webapp/WEB-INF/web.xml
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/CurationApp.java?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
Sat Aug 22 05:14:30 2015
@@ -1,11 +1,39 @@
package org.apache.oodt.cas.curation;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.oodt.cas.curation.fileTree.FileTree;
import org.apache.wicket.Page;
+import org.apache.wicket.ResourceReference;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.file.File;
public class CurationApp extends WebApplication {
+
+ private static final Logger LOG =
Logger.getLogger(CurationApp.class.getName());
+
+ /* (non-Javadoc)
+ * @see org.apache.wicket.protocol.http.WebApplication#init()
+ */
+ @Override
+ protected void init() {
+ super.init();
+ Set<String> resources = FileTree.getImageFiles();
+ if (resources != null){
+ for (String resource: resources){
+ String resName = new File(resource).getName();
+ String resPath = "/images/"+resName;
+ LOG.log(Level.INFO, "Mounting: ["+resPath+"]");
+ mountSharedResource(resPath,
+ new ResourceReference(FileTree.class,
+ resName).getSharedResourceKey());
+ }
+ }
+ }
- @Override
+ @Override
public Class<? extends Page> getHomePage() {
try {
return (Class<? extends Page>)
Class.forName(getHomePageClass());
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.css?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.css
(original)
+++ oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.css
Sat Aug 22 05:14:30 2015
@@ -40,108 +40,6 @@ div.editor table tr td img.pencil {
border-top:solid 1px #ccc;
}
-/* file tree */
-
-
-
-UL.fileTree {
- font-family: Verdana, sans-serif;
- font-size: 11px;
- line-height: 18px;
- padding: 0px;
- margin: 0px;
-}
-
-LI.helper {
- font-family: Verdana, sans-serif;
- font-size:11px;
- line-height:18px;
-}
-
-UL.fileTree LI, LI.helper {
- list-style: none;
- padding: 0px;
- padding-left: 20px;
- margin: 0px;
- white-space: nowrap;
-}
-
-UL.fileTree A, LI.helper A {
- color: #333;
- text-decoration: none;
- display: block;
- padding: 0px 2px;
-}
-
-UL.fileTree A:hover, LI.helper A {
- background: #BDF;
-}
-
-/* Core Styles */
-.fileTree LI.directory, LI.helper.directory { background:
url(../img/fileTree/directory.png) left top no-repeat; }
-.fileTree LI.expanded, LI.helper.expanded { background:
url(../img/fileTree/folder_open.png) left top no-repeat; }
-.fileTree LI.file, LI.helper.file { background:
url(../img/fileTree/file.png) left top no-repeat; }
-.fileTree LI.wait, LI.helper.wait { background:
url(../img/fileTree/spinner.gif) left top no-repeat; }
-/* File Extensions*/
-.fileTree LI.ext_3gp, LI.helper.ext_3gp { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_afp, LI.helper.ext_afp { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_afpa, LI.helper.ext_afpa { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_asp, LI.helper.ext_asp { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_aspx, LI.helper.ext_aspx { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_avi, LI.helper.ext_avi { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_bat, LI.helper.ext_bat { background:
url(../img/fileTree/application.png) left top no-repeat; }
-.fileTree LI.ext_bmp, LI.helper.ext_bmp { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_c, LI.helper.ext_c { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_cfm, LI.helper.ext_cfm { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_cgi, LI.helper.ext_cgi { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_com, LI.helper.ext_com { background:
url(../img/fileTree/application.png) left top no-repeat; }
-.fileTree LI.ext_cpp, LI.helper.ext_cpp { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_css, LI.helper.ext_css { background:
url(../img/fileTree/css.png) left top no-repeat; }
-.fileTree LI.ext_doc, LI.helper.ext_doc { background:
url(../img/fileTree/doc.png) left top no-repeat; }
-.fileTree LI.ext_exe, LI.helper.ext_exe { background:
url(../img/fileTree/application.png) left top no-repeat; }
-.fileTree LI.ext_gif, LI.helper.ext_gif { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_fla, LI.helper.ext_fla { background:
url(../img/fileTree/flash.png) left top no-repeat; }
-.fileTree LI.ext_h, LI.helper.ext_h { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_htm, LI.helper.ext_htm { background:
url(../img/fileTree/html.png) left top no-repeat; }
-.fileTree LI.ext_html, LI.helper.ext_html { background:
url(../img/fileTree/html.png) left top no-repeat; }
-.fileTree LI.ext_jar, LI.helper.ext_jar { background:
url(../img/fileTree/java.png) left top no-repeat; }
-.fileTree LI.ext_jpg, LI.helper.ext_jpg { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_jpeg, LI.helper.ext_jpeg { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_js, LI.helper.ext_js { background:
url(../img/fileTree/script.png) left top no-repeat; }
-.fileTree LI.ext_lasso, LI.helper.ext_lasso { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_log, LI.helper.ext_log { background:
url(../img/fileTree/txt.png) left top no-repeat; }
-.fileTree LI.ext_m4p, LI.helper.ext_m4p { background:
url(../img/fileTree/music.png) left top no-repeat; }
-.fileTree LI.ext_mov, LI.helper.ext_mov { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_mp3, LI.helper.ext_mp3 { background:
url(../img/fileTree/music.png) left top no-repeat; }
-.fileTree LI.ext_mp4, LI.helper.ext_mp4 { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_mpg, LI.helper.ext_mpg { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_mpeg, LI.helper.ext_mpeg { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_ogg, LI.helper.ext_ogg { background:
url(../img/fileTree/music.png) left top no-repeat; }
-.fileTree LI.ext_pcx, LI.helper.ext_pcx { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_pdf, LI.helper.ext_pdf { background:
url(../img/fileTree/pdf.png) left top no-repeat; }
-.fileTree LI.ext_php, LI.helper.ext_php { background:
url(../img/fileTree/php.png) left top no-repeat; }
-.fileTree LI.ext_png, LI.helper.ext_png { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_ppt, LI.helper.ext_ppt { background:
url(../img/fileTree/ppt.png) left top no-repeat; }
-.fileTree LI.ext_psd, LI.helper.ext_psd { background:
url(../img/fileTree/psd.png) left top no-repeat; }
-.fileTree LI.ext_pl, LI.helper.ext_pl { background:
url(../img/fileTree/script.png) left top no-repeat; }
-.fileTree LI.ext_py, LI.helper.ext_py { background:
url(../img/fileTree/script.png) left top no-repeat; }
-.fileTree LI.ext_rb, LI.helper.ext_rb { background:
url(../img/fileTree/ruby.png) left top no-repeat; }
-.fileTree LI.ext_rbx, LI.helper.ext_rbx { background:
url(../img/fileTree/ruby.png) left top no-repeat; }
-.fileTree LI.ext_rhtml, LI.helper.ext_rhtml { background:
url(../img/fileTree/ruby.png) left top no-repeat; }
-.fileTree LI.ext_rpm, LI.helper.ext_rpm { background:
url(../img/fileTree/linux.png) left top no-repeat; }
-.fileTree LI.ext_ruby, LI.helper.ext_ruby { background:
url(../img/fileTree/ruby.png) left top no-repeat; }
-.fileTree LI.ext_sql, LI.helper.ext_sql { background:
url(../img/fileTree/db.png) left top no-repeat; }
-.fileTree LI.ext_swf, LI.helper.ext_swf { background:
url(../img/fileTree/flash.png) left top no-repeat; }
-.fileTree LI.ext_tif, LI.helper.ext_tif { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_tiff, LI.helper.ext_tiff { background:
url(../img/fileTree/picture.png) left top no-repeat; }
-.fileTree LI.ext_txt, LI.helper.ext_txt { background:
url(../img/fileTree/txt.png) left top no-repeat; }
-.fileTree LI.ext_vb, LI.helper.ext_vb { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_wav, LI.helper.ext_wav { background:
url(../img/fileTree/music.png) left top no-repeat; }
-.fileTree LI.ext_wmv, LI.helper.ext_wmv { background:
url(../img/fileTree/film.png) left top no-repeat; }
-.fileTree LI.ext_xls, LI.helper.ext_xls { background:
url(../img/fileTree/xls.png) left top no-repeat; }
-.fileTree LI.ext_xml, LI.helper.ext_xml { background:
url(../img/fileTree/code.png) left top no-repeat; }
-.fileTree LI.ext_zip, LI.helper.ext_zip { background:
url(../img/fileTree/zip.png) left top no-repeat; }
-
/* MAIN.CSS */
/**
* CAS Header Styles
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.html?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.html
(original)
+++ oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/HomePage.html
Sat Aug 22 05:14:30 2015
@@ -18,12 +18,49 @@
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";>
<head>
<title>Apache OODT Curation Interface</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<wicket:link>
<link type="text/css" rel="stylesheet" href="HomePage.css"/>
+ <link type="text/css" rel="stylesheet" href="fileTree/FileTree_wicket.css"/>
+ <link type="text/css" rel="stylesheet" href="jquery.alerts.css"/>
+ <script type="text/javascript" src="jquery-1.3.2.js"></script>
+ <script type="text/javascript" src="jquery-ui-1.7.2.full.min.js"></script>
+ <script type="text/javascript" src="jquery.periodicalupdater.js"></script>
+ <script type="text/javascript" src="jquery.alerts.js"></script>
+ <script type="text/javascript" src="HomePage.js"></script>
</wicket:link>
+
+<wicket:remove>
+ <link type="text/css" rel="stylesheet" href="fileTree/FileTree.css"/>
+</wicket:remove>
+
</head>
-<body>
+<body onload="refreshIngestTaskList();registerIngestionTaskListener();">
+<div id="page">
+ <div id="cas-header">
+ <div id="cas-logo-left"><!-- cas logo lhs --></div>
+ <div id="cas-logo-right"><!-- cas logo rhs --></div>
+ <h2 class="app-title">Project Name CAS Curation</h2>
+ <div class="userdetails">
+ Logged in as mattmann
+ </div>
+ </div>
+ </div>
+
+ <div class="menu">
+ <!-- Breadcrumbs Area -->
+ <div id="breadcrumbs">
+ <div style="margin-left: 10px;padding-left: 10px;">
+ <a href="#" style="color:black;">Home</a> > Main
+ </div>
+ </div>
+ </div>
+
+<!-- begin main content -->
+<div style="position:relative;min-height:300px;">
+
+<!-- Curator Widget -->
<div class="page">
<div class="container browsers">
<div id="browseStagingContainer">
@@ -145,5 +182,14 @@
</div>
</div>
+</div>
+
+<!-- end main content -->
+<div id="footer">
+ Apache Software Foundation.<br/>
+ <a href="http://apache.org/";>apache.org</a><br/>
+ Built On Apache <a href="http://oodt.apache.org";>OODT</a>
+</div>
+
</body>
</html>
Added:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.css?rev=1697075&view=auto
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.css
(added)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.css
Sat Aug 22 05:14:30 2015
@@ -0,0 +1,102 @@
+/* file tree */
+
+
+
+UL.fileTree {
+ font-family: Verdana, sans-serif;
+ font-size: 11px;
+ line-height: 18px;
+ padding: 0px;
+ margin: 0px;
+}
+
+LI.helper {
+ font-family: Verdana, sans-serif;
+ font-size:11px;
+ line-height:18px;
+}
+
+UL.fileTree LI, LI.helper {
+ list-style: none;
+ padding: 0px;
+ padding-left: 20px;
+ margin: 0px;
+ white-space: nowrap;
+}
+
+UL.fileTree A, LI.helper A {
+ color: #333;
+ text-decoration: none;
+ display: block;
+ padding: 0px 2px;
+}
+
+UL.fileTree A:hover, LI.helper A {
+ background: #BDF;
+}
+
+/* Core Styles */
+.fileTree LI.directory, LI.helper.directory { background: url(directory.png)
left top no-repeat; }
+.fileTree LI.expanded, LI.helper.expanded { background: url(folder_open.png)
left top no-repeat; }
+.fileTree LI.file, LI.helper.file { background: url(file.png) left
top no-repeat; }
+.fileTree LI.wait, LI.helper.wait { background: url(spinner.gif)
left top no-repeat; }
+/* File Extensions*/
+.fileTree LI.ext_3gp, LI.helper.ext_3gp { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_afp, LI.helper.ext_afp { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_afpa, LI.helper.ext_afpa { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_asp, LI.helper.ext_asp { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_aspx, LI.helper.ext_aspx { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_avi, LI.helper.ext_avi { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_bat, LI.helper.ext_bat { background: url(application.png)
left top no-repeat; }
+.fileTree LI.ext_bmp, LI.helper.ext_bmp { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_c, LI.helper.ext_c { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_cfm, LI.helper.ext_cfm { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_cgi, LI.helper.ext_cgi { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_com, LI.helper.ext_com { background: url(application.png)
left top no-repeat; }
+.fileTree LI.ext_cpp, LI.helper.ext_cpp { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_css, LI.helper.ext_css { background: url(css.png) left top
no-repeat; }
+.fileTree LI.ext_doc, LI.helper.ext_doc { background: url(doc.png) left top
no-repeat; }
+.fileTree LI.ext_exe, LI.helper.ext_exe { background: url(application.png)
left top no-repeat; }
+.fileTree LI.ext_gif, LI.helper.ext_gif { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_fla, LI.helper.ext_fla { background: url(flash.png) left top
no-repeat; }
+.fileTree LI.ext_h, LI.helper.ext_h { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_htm, LI.helper.ext_htm { background: url(html.png) left top
no-repeat; }
+.fileTree LI.ext_html, LI.helper.ext_html { background: url(html.png) left top
no-repeat; }
+.fileTree LI.ext_jar, LI.helper.ext_jar { background: url(java.png) left top
no-repeat; }
+.fileTree LI.ext_jpg, LI.helper.ext_jpg { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_jpeg, LI.helper.ext_jpeg { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_js, LI.helper.ext_js { background: url(script.png) left top
no-repeat; }
+.fileTree LI.ext_lasso, LI.helper.ext_lasso { background: url(code.png) left
top no-repeat; }
+.fileTree LI.ext_log, LI.helper.ext_log { background: url(txt.png) left top
no-repeat; }
+.fileTree LI.ext_m4p, LI.helper.ext_m4p { background: url(music.png) left top
no-repeat; }
+.fileTree LI.ext_mov, LI.helper.ext_mov { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_mp3, LI.helper.ext_mp3 { background: url(music.png) left top
no-repeat; }
+.fileTree LI.ext_mp4, LI.helper.ext_mp4 { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_mpg, LI.helper.ext_mpg { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_mpeg, LI.helper.ext_mpeg { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_ogg, LI.helper.ext_ogg { background: url(music.png) left top
no-repeat; }
+.fileTree LI.ext_pcx, LI.helper.ext_pcx { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_pdf, LI.helper.ext_pdf { background: url(pdf.png) left top
no-repeat; }
+.fileTree LI.ext_php, LI.helper.ext_php { background: url(php.png) left top
no-repeat; }
+.fileTree LI.ext_png, LI.helper.ext_png { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_ppt, LI.helper.ext_ppt { background: url(ppt.png) left top
no-repeat; }
+.fileTree LI.ext_psd, LI.helper.ext_psd { background: url(psd.png) left top
no-repeat; }
+.fileTree LI.ext_pl, LI.helper.ext_pl { background: url(script.png) left top
no-repeat; }
+.fileTree LI.ext_py, LI.helper.ext_py { background: url(script.png) left top
no-repeat; }
+.fileTree LI.ext_rb, LI.helper.ext_rb { background: url(ruby.png) left top
no-repeat; }
+.fileTree LI.ext_rbx, LI.helper.ext_rbx { background: url(ruby.png) left top
no-repeat; }
+.fileTree LI.ext_rhtml, LI.helper.ext_rhtml { background: url(ruby.png) left
top no-repeat; }
+.fileTree LI.ext_rpm, LI.helper.ext_rpm { background: url(linux.png) left top
no-repeat; }
+.fileTree LI.ext_ruby, LI.helper.ext_ruby { background: url(ruby.png) left top
no-repeat; }
+.fileTree LI.ext_sql, LI.helper.ext_sql { background: url(db.png) left top
no-repeat; }
+.fileTree LI.ext_swf, LI.helper.ext_swf { background: url(flash.png) left top
no-repeat; }
+.fileTree LI.ext_tif, LI.helper.ext_tif { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_tiff, LI.helper.ext_tiff { background: url(picture.png) left
top no-repeat; }
+.fileTree LI.ext_txt, LI.helper.ext_txt { background: url(txt.png) left top
no-repeat; }
+.fileTree LI.ext_vb, LI.helper.ext_vb { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_wav, LI.helper.ext_wav { background: url(music.png) left top
no-repeat; }
+.fileTree LI.ext_wmv, LI.helper.ext_wmv { background: url(film.png) left top
no-repeat; }
+.fileTree LI.ext_xls, LI.helper.ext_xls { background: url(xls.png) left top
no-repeat; }
+.fileTree LI.ext_xml, LI.helper.ext_xml { background: url(code.png) left top
no-repeat; }
+.fileTree LI.ext_zip, LI.helper.ext_zip { background: url(zip.png) left top
no-repeat; }
+
Added:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.java?rev=1697075&view=auto
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.java
(added)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree.java
Sat Aug 22 05:14:30 2015
@@ -0,0 +1,24 @@
+package org.apache.oodt.cas.curation.fileTree;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.apache.wicket.markup.html.WebComponent;
+import org.reflections.Reflections;
+import org.reflections.scanners.ResourcesScanner;
+
+public class FileTree extends WebComponent{
+
+ public FileTree(String id) {
+ super(id);
+ }
+
+ private static final long serialVersionUID = 3911179455208050261L;
+
+ public static Set<String> getImageFiles() {
+ Pattern pattern = Pattern.compile(".*\\.png");
+ return new Reflections(FileTree.class.getPackage(), new ResourcesScanner())
+ .getResources(pattern);
+ }
+
+}
Added:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree_wicket.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree_wicket.css?rev=1697075&view=auto
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree_wicket.css
(added)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/fileTree/FileTree_wicket.css
Sat Aug 22 05:14:30 2015
@@ -0,0 +1,102 @@
+/* file tree */
+
+
+
+UL.fileTree {
+ font-family: Verdana, sans-serif;
+ font-size: 11px;
+ line-height: 18px;
+ padding: 0px;
+ margin: 0px;
+}
+
+LI.helper {
+ font-family: Verdana, sans-serif;
+ font-size:11px;
+ line-height:18px;
+}
+
+UL.fileTree LI, LI.helper {
+ list-style: none;
+ padding: 0px;
+ padding-left: 20px;
+ margin: 0px;
+ white-space: nowrap;
+}
+
+UL.fileTree A, LI.helper A {
+ color: #333;
+ text-decoration: none;
+ display: block;
+ padding: 0px 2px;
+}
+
+UL.fileTree A:hover, LI.helper A {
+ background: #BDF;
+}
+
+/* Core Styles */
+.fileTree LI.directory, LI.helper.directory { background:
url(../../../images/directory.png) left top no-repeat; }
+.fileTree LI.expanded, LI.helper.expanded { background:
url(../../../images/folder_open.png) left top no-repeat; }
+.fileTree LI.file, LI.helper.file { background:
url(../../../images/file.png) left top no-repeat; }
+.fileTree LI.wait, LI.helper.wait { background:
url(../../../images/spinner.gif) left top no-repeat; }
+/* File Extensions*/
+.fileTree LI.ext_3gp, LI.helper.ext_3gp { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_afp, LI.helper.ext_afp { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_afpa, LI.helper.ext_afpa { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_asp, LI.helper.ext_asp { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_aspx, LI.helper.ext_aspx { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_avi, LI.helper.ext_avi { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_bat, LI.helper.ext_bat { background:
url(../../../images/application.png) left top no-repeat; }
+.fileTree LI.ext_bmp, LI.helper.ext_bmp { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_c, LI.helper.ext_c { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_cfm, LI.helper.ext_cfm { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_cgi, LI.helper.ext_cgi { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_com, LI.helper.ext_com { background:
url(../../../images/application.png) left top no-repeat; }
+.fileTree LI.ext_cpp, LI.helper.ext_cpp { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_css, LI.helper.ext_css { background:
url(../../../images/css.png) left top no-repeat; }
+.fileTree LI.ext_doc, LI.helper.ext_doc { background:
url(../../../images/doc.png) left top no-repeat; }
+.fileTree LI.ext_exe, LI.helper.ext_exe { background:
url(../../../images/application.png) left top no-repeat; }
+.fileTree LI.ext_gif, LI.helper.ext_gif { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_fla, LI.helper.ext_fla { background:
url(../../../images/flash.png) left top no-repeat; }
+.fileTree LI.ext_h, LI.helper.ext_h { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_htm, LI.helper.ext_htm { background:
url(../../../images/html.png) left top no-repeat; }
+.fileTree LI.ext_html, LI.helper.ext_html { background:
url(../../../images/html.png) left top no-repeat; }
+.fileTree LI.ext_jar, LI.helper.ext_jar { background:
url(../../../images/java.png) left top no-repeat; }
+.fileTree LI.ext_jpg, LI.helper.ext_jpg { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_jpeg, LI.helper.ext_jpeg { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_js, LI.helper.ext_js { background:
url(../../../images/script.png) left top no-repeat; }
+.fileTree LI.ext_lasso, LI.helper.ext_lasso { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_log, LI.helper.ext_log { background:
url(../../../images/txt.png) left top no-repeat; }
+.fileTree LI.ext_m4p, LI.helper.ext_m4p { background:
url(../../../images/music.png) left top no-repeat; }
+.fileTree LI.ext_mov, LI.helper.ext_mov { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_mp3, LI.helper.ext_mp3 { background:
url(../../../images/music.png) left top no-repeat; }
+.fileTree LI.ext_mp4, LI.helper.ext_mp4 { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_mpg, LI.helper.ext_mpg { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_mpeg, LI.helper.ext_mpeg { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_ogg, LI.helper.ext_ogg { background:
url(../../../images/music.png) left top no-repeat; }
+.fileTree LI.ext_pcx, LI.helper.ext_pcx { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_pdf, LI.helper.ext_pdf { background:
url(../../../images/pdf.png) left top no-repeat; }
+.fileTree LI.ext_php, LI.helper.ext_php { background:
url(../../../images/php.png) left top no-repeat; }
+.fileTree LI.ext_png, LI.helper.ext_png { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_ppt, LI.helper.ext_ppt { background:
url(../../../images/ppt.png) left top no-repeat; }
+.fileTree LI.ext_psd, LI.helper.ext_psd { background:
url(../../../images/psd.png) left top no-repeat; }
+.fileTree LI.ext_pl, LI.helper.ext_pl { background:
url(../../../images/script.png) left top no-repeat; }
+.fileTree LI.ext_py, LI.helper.ext_py { background:
url(../../../images/script.png) left top no-repeat; }
+.fileTree LI.ext_rb, LI.helper.ext_rb { background:
url(../../../images/ruby.png) left top no-repeat; }
+.fileTree LI.ext_rbx, LI.helper.ext_rbx { background:
url(../../../images/ruby.png) left top no-repeat; }
+.fileTree LI.ext_rhtml, LI.helper.ext_rhtml { background:
url(../../../images/ruby.png) left top no-repeat; }
+.fileTree LI.ext_rpm, LI.helper.ext_rpm { background:
url(../../../images/linux.png) left top no-repeat; }
+.fileTree LI.ext_ruby, LI.helper.ext_ruby { background:
url(../../../images/ruby.png) left top no-repeat; }
+.fileTree LI.ext_sql, LI.helper.ext_sql { background:
url(../../../images/db.png) left top no-repeat; }
+.fileTree LI.ext_swf, LI.helper.ext_swf { background:
url(../../../images/flash.png) left top no-repeat; }
+.fileTree LI.ext_tif, LI.helper.ext_tif { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_tiff, LI.helper.ext_tiff { background:
url(../../../images/picture.png) left top no-repeat; }
+.fileTree LI.ext_txt, LI.helper.ext_txt { background:
url(../../../images/txt.png) left top no-repeat; }
+.fileTree LI.ext_vb, LI.helper.ext_vb { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_wav, LI.helper.ext_wav { background:
url(../../../images/music.png) left top no-repeat; }
+.fileTree LI.ext_wmv, LI.helper.ext_wmv { background:
url(../../../images/film.png) left top no-repeat; }
+.fileTree LI.ext_xls, LI.helper.ext_xls { background:
url(../../../images/xls.png) left top no-repeat; }
+.fileTree LI.ext_xml, LI.helper.ext_xml { background:
url(../../../images/code.png) left top no-repeat; }
+.fileTree LI.ext_zip, LI.helper.ext_zip { background:
url(../../../images/zip.png) left top no-repeat; }
+
Added:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/jquery.alerts.js
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/jquery.alerts.js?rev=1697075&view=auto
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/jquery.alerts.js
(added)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/jquery.alerts.js
Sat Aug 22 05:14:30 2015
@@ -0,0 +1,315 @@
+// jQuery Alert Dialogs Plugin
+//
+// Version 1.1
+//
+// Cory S.N. LaViska
+// A Beautiful Site (http://abeautifulsite.net/)
+// 14 May 2009
+//
+// Visit http://abeautifulsite.net/notebook/87 for more information
+//
+// Usage:
+// jAlert( message, [title, callback] )
+// jConfirm( message, [title, callback] )
+// jPrompt( message, [value, title, callback] )
+// jPromptMulti( message, [value, title, callback] )
+//
+// History:
+//
+// 1.00 - Released (29 December 2008)
+//
+// 1.01 - Fixed bug where unbinding would destroy all resize events
+//
+// License:
+//
+// This plugin is dual-licensed under the GNU General Public License and the
MIT License and
+// is copyright 2008 A Beautiful Site, LLC.
+//
+// UPDATED by Andrew Hart (andrew.f.h...@jpl.nasa.gov) to provide
functionality for a
+// multi-valued prompt. The multi-valued prompt offers the user the ability to
specify
+// more than one value for a given identifier. If providing seed values
(values to
+// place in the editor when first showing the prompt, they need to adhere to
the following
+// two conventions:
+//
+// 1) Individual values must be wrapped in <span/> tags
+// 2) All <span/> tags must be wrapped in a single container tag (can be
anything (li,div,td,etc))
+//
+// When calling jPromptMulti, pass a handle to the container tag as the
'value' parameter.
+// Example:
+//
+// given html: <li id="myValues"><span>value1</span>,
<span>value2</span></li>
+//
+// you would call jPromptMulti('Update
values',$('#myValues'),'title',callbackFn);
+//
+// If a callback function is provided (and only if the user clicks 'SAVE'),
the callback
+// will be executed. The callback function should expect a single parameter
(which will be
+// the list of user-specified values represented as a regular JavaScript
array).
+//
+//
+// jPromptMulti(
+(function($) {
+
+ $.alerts = {
+
+ // These properties can be read/written by accessing
$.alerts.propertyName from your scripts at any time
+
+ verticalOffset: -75, // vertical offset of the
dialog from center screen, in pixels
+ horizontalOffset: 0, // horizontal offset of the
dialog from center screen, in pixels/
+ repositionOnResize: true, // re-centers the dialog on
window resize
+ overlayOpacity: .01, // transparency level of
overlay
+ overlayColor: '#FFF', // base color of overlay
+ draggable: true, // make the dialogs
draggable (requires UI Draggables plugin)
+ okButton: ' SAVE ', // text for the OK button
+ cancelButton: ' Cancel ', // text for the Cancel
button
+ dialogClass: null, // if specified, this class
will be applied to all dialogs
+
+ // Public methods
+
+ alert: function(message, title, callback) {
+ if( title == null ) title = 'Alert';
+ $.alerts._show(title, message, null, 'alert',
function(result) {
+ if( callback ) callback(result);
+ });
+ },
+
+ confirm: function(message, title, callback) {
+ if( title == null ) title = 'Confirm';
+ $.alerts._show(title, message, null, 'confirm',
function(result) {
+ if( callback ) callback(result);
+ });
+ },
+
+ prompt: function(message, value, title, callback) {
+ if( title == null ) title = 'title';
+ $.alerts._show(title, message, value, 'prompt',
function(result) {
+ if( callback ) callback(result);
+ });
+ },
+
+ promptMulti: function(message, value, title, callback) {
+ if( title == null) title = 'title';
+ $.alerts._show(title, message, value, 'promptMulti',
function(result) {
+ if( callback ) callback(result);
+ });
+ },
+
+ // Private methods
+
+ _show: function(title, msg, value, type, callback) {
+
+ $.alerts._hide();
+ $.alerts._overlay('show');
+
+ $("BODY").append(
+ '<div id="popup_container">' +
+ '<h1 id="popup_title"></h1>' +
+ '<div id="popup_content">' +
+ '<div id="popup_message"></div>' +
+ '</div>' +
+ '</div>');
+
+ if( $.alerts.dialogClass )
$("#popup_container").addClass($.alerts.dialogClass);
+
+ // IE6 Fix
+ var pos = ($.browser.msie &&
parseInt($.browser.version) <= 6 ) ? 'absolute' : 'fixed';
+
+ $("#popup_container").css({
+ position: pos,
+ zIndex: 99999,
+ padding: 0,
+ margin: 0
+ });
+
+ $("#popup_title").text(title);
+ $("#popup_content").addClass(type);
+ $("#popup_message").text(msg);
+ $("#popup_message").html(
$("#popup_message").text().replace(/\n/g, '<br />') );
+
+ $("#popup_container").css({
+ minWidth: $("#popup_container").outerWidth(),
+ maxWidth: $("#popup_container").outerWidth()
+ });
+
+ $.alerts._reposition();
+ $.alerts._maintainPosition(true);
+
+ switch( type ) {
+ case 'alert':
+ $("#popup_message").after('<div
id="popup_panel"><input type="button" value="' + $.alerts.okButton + '"
id="popup_ok" /></div>');
+ $("#popup_ok").click( function() {
+ $.alerts._hide();
+ callback(true);
+ });
+ $("#popup_ok").focus().keypress(
function(e) {
+ if( e.keyCode == 13 ||
e.keyCode == 27 ) $("#popup_ok").trigger('click');
+ });
+ break;
+ case 'confirm':
+ $("#popup_message").after('<div
id="popup_panel"><input type="button" value="' + $.alerts.okButton + '"
id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '"
id="popup_cancel" /></div>');
+ $("#popup_ok").click( function() {
+ $.alerts._hide();
+ if( callback ) callback(true);
+ });
+ $("#popup_cancel").click( function() {
+ $.alerts._hide();
+ if( callback ) callback(false);
+ });
+ $("#popup_ok").focus();
+ $("#popup_ok, #popup_cancel").keypress(
function(e) {
+ if( e.keyCode == 13 )
$("#popup_ok").trigger('click');
+ if( e.keyCode == 27 )
$("#popup_cancel").trigger('click');
+ });
+ break;
+ case 'prompt':
+ $("#popup_message").append('<br
/><input type="text" size="30" id="popup_prompt" />').after('<div
id="popup_panel"><input type="button" value="' + $.alerts.okButton + '"
id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '"
id="popup_cancel" /></div>');
+ $("#popup_prompt").width(
$("#popup_message").width() );
+ $("#popup_ok").click( function() {
+ var val =
$("#popup_prompt").val();
+ $.alerts._hide();
+ if( callback ) callback( val );
+ });
+ $("#popup_cancel").click( function() {
+ $.alerts._hide();
+ if( callback ) callback( null );
+ });
+ $("#popup_prompt, #popup_ok,
#popup_cancel").keypress( function(e) {
+ if( e.keyCode == 13 )
$("#popup_ok").trigger('click');
+ if( e.keyCode == 27 )
$("#popup_cancel").trigger('click');
+ });
+ if( value )
$("#popup_prompt").val(value);
+ $("#popup_prompt").focus().select();
+ break;
+ case 'promptMulti':
+ // In the case of a multiple value
prompt, 'value' should be a jQuery DOM object containing
+ // a number of individual values
wrapped in <span/> elements. Each <span/> element in
+ // the provided message is inspected,
and its text value is used.
+ // example: <td><span>value1</span>,
<span>value2</span></td>
+ // would translate into 2 values
(value1 and value2) being displayed for editing.
+
+ value.children('span').each(function() {
+ var $input = $('<input>')
+
.attr({'type':'text','size':'30','class':'popup_multiPrompt','value':$(this).text()});
+
$("#popup_message").append('<br/>').append($input);
+ });
+ $("#popup_message")
+ .after ('<br/><input
type="button" id="multiPromptNewValue" value="+"/> Add a new value' +
+ '<div
id="popup_panel"><input type="button" value="' +
+
$.alerts.okButton +
+ '"
id="popup_ok" /> <input type="button" value="' +
+
$.alerts.cancelButton +
+ '"
id="popup_cancel" /></div>');
+
+ $(".popup_multiPrompt").width(
$("#popup_message").width() );
+ $("#multiPromptNewValue").click(
function() {
+ $("#popup_message")
+ .append('<br /><input
type="text" size="30" class="popup_multiPrompt" value=""/>');
+ $(".popup_multiPrompt").width(
$("#popup_message").width() );
+
+ });
+ $("#popup_ok").click( function() {
+ // Gather values
+ var values = Array();
+ $(".popup_multiPrompt").each(
function() {
+ if ($(this).val())
values.push($(this).val());
+ });
+ $.alerts._hide();
+ if( callback ) callback( values
);
+ });
+ $("#popup_cancel").click( function() {
+ $.alerts._hide();
+ if( callback ) callback( null );
+ });
+ $("#popup_prompt, #popup_ok,
#popup_cancel").keypress( function(e) {
+ if( e.keyCode == 13 )
$("#popup_ok").trigger('click');
+ if( e.keyCode == 27 )
$("#popup_cancel").trigger('click');
+ });
+ if( value )
$("#popup_prompt").val(value);
+ $("#popup_prompt").focus().select();
+ break;
+ }
+
+ // Make draggable
+ if( $.alerts.draggable ) {
+ try {
+ $("#popup_container").draggable({
handle: $("#popup_title") });
+ $("#popup_title").css({ cursor: 'move'
});
+ } catch(e) { /* requires jQuery UI draggables
*/ }
+ }
+ },
+
+ _hide: function() {
+ $("#popup_container").remove();
+ $.alerts._overlay('hide');
+ $.alerts._maintainPosition(false);
+ },
+
+ _overlay: function(status) {
+ switch( status ) {
+ case 'show':
+ $.alerts._overlay('hide');
+ $("BODY").append('<div
id="popup_overlay"></div>');
+ $("#popup_overlay").css({
+ position: 'absolute',
+ zIndex: 99998,
+ top: '0px',
+ left: '0px',
+ width: '100%',
+ height: $(document).height(),
+ background:
$.alerts.overlayColor,
+ opacity: $.alerts.overlayOpacity
+ });
+ break;
+ case 'hide':
+ $("#popup_overlay").remove();
+ break;
+ }
+ },
+
+ _reposition: function() {
+ var top = (($(window).height() / 2) -
($("#popup_container").outerHeight() / 2)) + $.alerts.verticalOffset;
+ var left = (($(window).width() / 2) -
($("#popup_container").outerWidth() / 2)) + $.alerts.horizontalOffset;
+ if( top < 0 ) top = 0;
+ if( left < 0 ) left = 0;
+
+ // IE6 fix
+ if( $.browser.msie && parseInt($.browser.version) <= 6
) top = top + $(window).scrollTop();
+
+ $("#popup_container").css({
+ top: top + 'px',
+ left: left + 'px'
+ });
+ $("#popup_overlay").height( $(document).height() );
+ },
+
+ _maintainPosition: function(status) {
+ if( $.alerts.repositionOnResize ) {
+ switch(status) {
+ case true:
+ $(window).bind('resize',
$.alerts._reposition);
+ break;
+ case false:
+ $(window).unbind('resize',
$.alerts._reposition);
+ break;
+ }
+ }
+ }
+
+ }
+
+ // Shortuct functions
+ jAlert = function(message, title, callback) {
+ $.alerts.alert(message, title, callback);
+ }
+
+ jConfirm = function(message, title, callback) {
+ $.alerts.confirm(message, title, callback);
+ };
+
+ jPrompt = function(message, value, title, callback) {
+ $.alerts.prompt(message, value, title, callback);
+ };
+
+ jPromptMulti = function(message, value, title, callback) {
+ $.alerts.promptMulti(message, value, title, callback);
+ };
+})(jQuery);
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java?rev=1697075&r1=1663022&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
Sat Aug 22 05:14:30 2015
@@ -16,7 +16,7 @@
*/
-package org.apache.oodt.cas.curation.config;
+package org.apache.oodt.cas.curation.metadata;
/**
*
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
Sat Aug 22 05:14:30 2015
@@ -19,10 +19,11 @@
package org.apache.oodt.cas.curation.service;
//OODT imports
-import org.apache.oodt.cas.curation.config.CuratorConfMetKeys;
+import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
import org.apache.oodt.cas.curation.util.SSOUtils;
import org.apache.oodt.security.sso.SingleSignOn;
+
//JDK imports
import java.io.File;
import java.io.FilenameFilter;
@@ -34,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -41,10 +43,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
+
//JAX-RS imports
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+
//APACHE imports
import org.apache.commons.lang.StringUtils;
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
Sat Aug 22 05:14:30 2015
@@ -19,11 +19,12 @@
package org.apache.oodt.cas.curation.service;
//OODT imports
-import org.apache.oodt.cas.curation.config.CuratorConfMetKeys;
+import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
import org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.util.PathUtils;
+
//JDK imports
import java.net.URL;
import java.util.Enumeration;
@@ -31,6 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/DirectoryResource.java
Sat Aug 22 05:14:30 2015
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.oodt.cas.curation.service;
//JDK imports
@@ -32,8 +31,6 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
-
-
@Path("directory")
/**
*
@@ -49,7 +46,7 @@ public class DirectoryResource extends C
@Context
UriInfo uriInfo;
-
+
private static final long serialVersionUID = 715126227357637464L;
@GET
@@ -60,12 +57,12 @@ public class DirectoryResource extends C
@DefaultValue("true") @QueryParam("showFiles") boolean showFiles,
@DefaultValue(FORMAT_HTML) @QueryParam("format") String format) {
if (FORMAT_HTML.equals(format)) {
- String response = this.getDirectoryAreaAsHTML(CurationService.config
- .getStagingAreaPath(), path, showFiles);
+ String response = this.getDirectoryAreaAsHTML(
+ CurationService.config.getStagingAreaPath(), path, showFiles);
return response;
}
- return this.getDirectoryAreaAsJSON(CurationService.config
- .getStagingAreaPath(), path, showFiles);
+ return this.getDirectoryAreaAsJSON(
+ CurationService.config.getStagingAreaPath(), path, showFiles);
}
@GET
@@ -89,7 +86,6 @@ public class DirectoryResource extends C
return productType;
}
-
public String getDirectoryAreaAsHTML(String base, String path,
boolean showFiles) {
StringBuffer html = new StringBuffer();
@@ -108,31 +104,36 @@ public class DirectoryResource extends C
html.append("<ul class=\"fileTree\">\r\n");
// Loop through and list directories first. Nicer for UI to get these first
- for (int i = 0; i < f.length; i++) {
- if (new File(startingPath + "/" + f[i]).isDirectory()) {
- html.append(" <li class=\"directory collapsed\">");
- html.append("<a href=\"#\" rel=\"").append(relativePath).append("/")
- .append(f[i]).append("\">").append(f[i]).append("</a>");
- html.append("</li>\r\n");
- }
- }
- // If we are showing files now loop through and show files
- if (showFiles) {
+
+ if (f != null) {
for (int i = 0; i < f.length; i++) {
- if (new File(startingPath + "/" + f[i]).isFile()) {
- String filename = new File(startingPath + "/" + f[i]).getName();
- String ext = filename.substring(filename.lastIndexOf('.') + 1);
- html.append(" <li class=\"file draggy ext_").append(ext)
- .append("\">");
+ if (new File(startingPath + "/" + f[i]).isDirectory()) {
+ html.append(" <li class=\"directory collapsed\">");
html.append("<a href=\"#\" rel=\"").append(relativePath).append("/")
.append(f[i]).append("\">").append(f[i]).append("</a>");
html.append("</li>\r\n");
}
}
+ // If we are showing files now loop through and show files
+ if (showFiles) {
+ for (int i = 0; i < f.length; i++) {
+ if (new File(startingPath + "/" + f[i]).isFile()) {
+ String filename = new File(startingPath + "/" + f[i]).getName();
+ String ext = filename.substring(filename.lastIndexOf('.') + 1);
+ html.append(" <li class=\"file draggy ext_").append(ext)
+ .append("\">");
+ html.append("<a href=\"#\" rel=\"").append(relativePath)
+ .append("/").append(f[i]).append("\">").append(f[i])
+ .append("</a>");
+ html.append("</li>\r\n");
+ }
+ }
+ }
+
}
html.append("</ul>");
return html.toString();
}
-
+
}
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
Sat Aug 22 05:14:30 2015
@@ -23,9 +23,10 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
//OODT imports
import org.apache.oodt.cas.curation.service.CurationServiceConfig;
-import org.apache.oodt.cas.curation.config.CuratorConfMetKeys;
import org.apache.oodt.security.sso.AbstractWebBasedSingleSignOn;
import org.apache.oodt.security.sso.SingleSignOnFactory;
Modified: oodt/trunk/curator/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/webapp/META-INF/context.xml?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/curator/src/main/webapp/META-INF/context.xml Sat Aug 22 05:14:30
2015
@@ -21,16 +21,16 @@ the License.
value="OODT"/>
<Parameter
name="org.apache.oodt.cas.curator.metExtractorConf.uploadPath"
- value="[OODT_HOME]/extractors/cas_curator" />
+ value="[OODT_HOME]/extractors" />
<Parameter name="org.apache.oodt.cas.curator.dataDefinition.uploadPath"
value="[FILEMGR_HOME]/policy" />
<Parameter name="org.apache.oodt.cas.curator.stagingAreaPath"
- value="[OODT_HOME]/data/ingest"/>
+ value="[OODT_HOME]/data/staging"/>
<Parameter name="org.apache.oodt.cas.curator.metAreaPath"
- value="[OODT_HOME]]/data/met"/>
+ value="[OODT_HOME]/data/met"/>
<Parameter name="org.apache.oodt.cas.curator.fmProps"
value="[FILEMGR_HOME]/etc/filemgr.properties"/>
Modified: oodt/trunk/curator/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/webapp/WEB-INF/web.xml?rev=1697075&r1=1697074&r2=1697075&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/webapp/WEB-INF/web.xml (original)
+++ oodt/trunk/curator/src/main/webapp/WEB-INF/web.xml Sat Aug 22 05:14:30 2015
@@ -35,6 +35,15 @@ the License.
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <display-name>Curation Service</display-name>
+ <servlet-name>Curation Service</servlet-name>
+ <servlet-class>
+ org.apache.oodt.cas.curation.service.CurationService
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<filter>
<filter-name>wicket.browser</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
