You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/09/25 14:55:14 UTC
svn commit: r1705287 [1/2] - in /oodt/branches/dependency-update: ./
agility/ app/fmbrowser/ app/weditor/ balance/lib/pear/Core/ catalog/ cli/
commons/ commons/src/test/java/org/apache/oodt/commons/io/
commons/src/test/java/org/apache/oodt/commons/util...
Author: magicaltrout
Date: Fri Sep 25 12:55:12 2015
New Revision: 1705287
URL: http://svn.apache.org/viewvc?rev=1705287&view=rev
Log:
Merge update trunk to dep update branch
Added:
oodt/branches/dependency-update/curator/services/
- copied from r1705286, oodt/trunk/curator/services/
oodt/branches/dependency-update/curator/webapp/
- copied from r1705286, oodt/trunk/curator/webapp/
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/cas/
- copied from r1705286, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/cas/
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkbenchPage.html
- copied unchanged from r1705286, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkbenchPage.html
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkbenchPage.java
- copied unchanged from r1705286, oodt/trunk/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/WorkbenchPage.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
- copied unchanged from r1705286, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetExecReportCliAction.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
- copied unchanged from r1705286, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetNodeReportCliAction.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
- copied unchanged from r1705286, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/ResourceNodeComparator.java
- copied unchanged from r1705286, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/ResourceNodeComparator.java
oodt/branches/dependency-update/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/
- copied from r1705286, oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/
oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/product/HttpRedirectException.java
- copied unchanged from r1705286, oodt/trunk/xmlquery/src/main/java/org/apache/oodt/product/HttpRedirectException.java
Removed:
oodt/branches/dependency-update/curator/pom.xml
oodt/branches/dependency-update/curator/src/
Modified:
oodt/branches/dependency-update/ (props changed)
oodt/branches/dependency-update/CHANGES.txt
oodt/branches/dependency-update/agility/setup.py
oodt/branches/dependency-update/app/fmbrowser/pom.xml
oodt/branches/dependency-update/app/weditor/pom.xml
oodt/branches/dependency-update/balance/lib/pear/Core/ApplicationRequest.class.php
oodt/branches/dependency-update/catalog/pom.xml
oodt/branches/dependency-update/cli/pom.xml
oodt/branches/dependency-update/commons/pom.xml
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
oodt/branches/dependency-update/commons/src/test/resources/test.xml
oodt/branches/dependency-update/core/pom.xml
oodt/branches/dependency-update/crawler/pom.xml
oodt/branches/dependency-update/filemgr/pom.xml
oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
oodt/branches/dependency-update/filemgr/src/main/resources/cmd-line-options.xml
oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java
oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestAddProductTypeCliAction.java
oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
oodt/branches/dependency-update/filemgr/src/test/resources/cmd-line-options.xml
oodt/branches/dependency-update/grid/pom.xml
oodt/branches/dependency-update/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
oodt/branches/dependency-update/metadata/pom.xml
oodt/branches/dependency-update/mvn/archetypes/opsui/pom.xml
oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/pom.xml
oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
oodt/branches/dependency-update/mvn/archetypes/pom.xml
oodt/branches/dependency-update/mvn/archetypes/radix/pom.xml
oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/bin/radix
oodt/branches/dependency-update/mvn/plugins/cas-install/pom.xml
oodt/branches/dependency-update/opendapps/pom.xml
oodt/branches/dependency-update/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
oodt/branches/dependency-update/pcs/core/pom.xml
oodt/branches/dependency-update/pcs/input/pom.xml
oodt/branches/dependency-update/pcs/opsui/pom.xml
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.html
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java
oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
oodt/branches/dependency-update/pcs/opsui/src/main/webapp/META-INF/context.xml
oodt/branches/dependency-update/pcs/opsui/src/main/webapp/WEB-INF/web.xml
oodt/branches/dependency-update/pcs/services/pom.xml
oodt/branches/dependency-update/pge/pom.xml
oodt/branches/dependency-update/pom.xml
oodt/branches/dependency-update/product/pom.xml
oodt/branches/dependency-update/profile/pom.xml
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Profile.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Utility.java
oodt/branches/dependency-update/profile/src/test/resources/org/apache/oodt/profile/test.xml
oodt/branches/dependency-update/profile/src/test/resources/test.xml
oodt/branches/dependency-update/protocol/api/pom.xml
oodt/branches/dependency-update/protocol/ftp/pom.xml
oodt/branches/dependency-update/protocol/http/pom.xml
oodt/branches/dependency-update/protocol/imaps/pom.xml
oodt/branches/dependency-update/protocol/sftp/pom.xml
oodt/branches/dependency-update/pushpull/pom.xml
oodt/branches/dependency-update/resource/pom.xml
oodt/branches/dependency-update/resource/src/main/bin/resmgr
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxBatchManager.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java
oodt/branches/dependency-update/resource/src/main/resources/cmd-line-actions.xml
oodt/branches/dependency-update/resource/src/main/resources/cmd-line-options.xml
oodt/branches/dependency-update/resource/src/test/java/org/apache/oodt/cas/resource/mux/mocks/MockBatchManager.java
oodt/branches/dependency-update/sso/pom.xml
oodt/branches/dependency-update/webapp/components/pom.xml
oodt/branches/dependency-update/webapp/fmbrowser/pom.xml
oodt/branches/dependency-update/webapp/fmprod/pom.xml
oodt/branches/dependency-update/webapp/wmonitor/pom.xml
oodt/branches/dependency-update/workflow/pom.xml
oodt/branches/dependency-update/workflow/src/main/bin/wmgr
oodt/branches/dependency-update/xmlps/pom.xml
oodt/branches/dependency-update/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
oodt/branches/dependency-update/xmlquery/pom.xml
oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java
Propchange: oodt/branches/dependency-update/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 25 12:55:12 2015
@@ -1,3 +1,6 @@
+/oodt/branches/0.10:1701304-1701536
/oodt/branches/0.8.1:1657924-1657925
+/oodt/tags/0.10-rc1:1700212-1701303
/oodt/tags/0.8.1:1655770-1657922
/oodt/tags/0.8.1-rc1:1657923
+/oodt/trunk:1696489-1705286
Modified: oodt/branches/dependency-update/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/CHANGES.txt?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/CHANGES.txt (original)
+++ oodt/branches/dependency-update/CHANGES.txt Fri Sep 25 12:55:12 2015
@@ -1,6 +1,51 @@
Apache OODT Change Log
======================
-Release 0.10 - Current Development
+Release 0.11 - Current Development
+
+* OODT-874 Corrected workflow/bin/wmgr and resource/bin/resmgr to make sure
+ they both delete the cas.xxxx.pid file when stopped using the 'stop'
+ command. (mallder)
+
+* OODT-872 Upgrade Jena dependencies to org.apache.jena 3.0.0 (lewismc, mattmann)
+
+Release 0.10 - 08/30/2015
+
+* OODT-871 Issues with OODT 0.10 RC#1 (lewismc, mattmann)
+
+* OODT-246 Give user the ability to print a detailed report on what jobs in
+ the Resource Manager are running on what nodes (Gabe Resneck, mattmann)
+
+* OODT-245 List results from the Resource Manager client should be sorted
+ alphabetically (Gabe Resneck via mattmann)
+
+* OODT-248 Give user the ability to print a detailed report on the load, capacity
+ and queues of all nodes in the Resource Manager (Gabe Resneck, mattmann)
+
+* OODT-247 Resource Manager client should allow users to see what jobs are
+ currently in the queue (Gabe Resneck, mattmann)
+
+* OODT-244 Allow the Resource Manager scheduler to cycle on a non-integer
+ number of seconds (Gabe Resneck via mattmann)
+
+* OODT-864 Upgrade to Tika 1.10 (mattmann,tpalsulich)
+
+* OODT-686 AddProductTypeCliAction should prompt for ProductTypeId (rverma, mattmann)
+
+* OODT-302 Add support in the xmlquery package to handle HTTP Redirection (Michael Cayanan via mattmann)
+
+* OODT-303 Add support in the Grid Package to throw an HTTP Servlet Response (Michael Cayanan via mattmann)
+
+* OODT-480 Balance: default view not found (Nesbert Hidalgo via mattmann)
+
+* OODT-598 XMLQuery DIS-style query parser needs to treat "#" as a word character (kelly via mattmann)
+
+* OODT-870 Integrate Curator into OPSUI (mattmann)
+
+* OODT-842 create restful version of cas curator services (mattmann)
+
+* OODT-838 Separate RESTful Servers and Clients (Michael Starch, mattmann)
+
+* OODT-824 Port the Curator to Apache Wicket (mattmann)
* OODT-861 Workflow Manager client will print the list of task ids for a given workflow, if requested (luca)
Modified: oodt/branches/dependency-update/agility/setup.py
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/agility/setup.py?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/agility/setup.py (original)
+++ oodt/branches/dependency-update/agility/setup.py Fri Sep 25 12:55:12 2015
@@ -25,7 +25,7 @@ from setuptools import find_packages, se
# ------------
_name = 'oodt'
-_version = '0.10'
+_version = '0.11'
_description = 'Apache OODT'
_url = 'http://oodt.apache.org/'
_downloadURL = 'http://pypi.python.org/pypi/oodt/'
Modified: oodt/branches/dependency-update/app/fmbrowser/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/app/fmbrowser/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/app/fmbrowser/pom.xml (original)
+++ oodt/branches/dependency-update/app/fmbrowser/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-fm-browser</artifactId>
Modified: oodt/branches/dependency-update/app/weditor/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/app/weditor/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/app/weditor/pom.xml (original)
+++ oodt/branches/dependency-update/app/weditor/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>weditor</artifactId>
@@ -61,7 +61,7 @@ the License.
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-workflow</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.jung</groupId>
Modified: oodt/branches/dependency-update/balance/lib/pear/Core/ApplicationRequest.class.php
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/balance/lib/pear/Core/ApplicationRequest.class.php?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/balance/lib/pear/Core/ApplicationRequest.class.php (original)
+++ oodt/branches/dependency-update/balance/lib/pear/Core/ApplicationRequest.class.php Fri Sep 25 12:55:12 2015
@@ -78,7 +78,7 @@ class Org_Apache_Oodt_Balance_Core_Appli
protected function processAsView() {
// Determine the view to use
- list($thePage) = explode('index.php',$this->uri);
+ list($thePage) = explode('index.php', parse_url($this->uri, PHP_URL_PATH)); // we only care about URL path info
$thePage = ltrim($thePage,'/');
if ($thePage == '') { $thePage = 'index'; }
@@ -100,7 +100,9 @@ class Org_Apache_Oodt_Balance_Core_Appli
// directory, chop off the last segment and try again. Add the chopped
// segment to the "segments" array since it is likely a parameter.
$partCount = count($parts);
- while ($partCount > 0) {
+
+ // check for view at least once
+ do {
$testPath = implode('/',$parts);
$homeTest = (($this->isModule) ? "{$this->modulePath}/views" : $this->config['views_dir']) . '/' . $testPath . '.php';
$homeIdxTest = (($this->isModule) ? "{$this->modulePath}/views" : $this->config['views_dir']) . '/' . $testPath . '/index.php';
@@ -119,7 +121,7 @@ class Org_Apache_Oodt_Balance_Core_Appli
$this->segments[] = $parts[$partCount - 1];
array_pop($parts);
$partCount--;
- }
+ } while ($partCount > 0);
// If no view has been found by this point, display a 404 message
if (!$this->viewPath) {
Modified: oodt/branches/dependency-update/catalog/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/catalog/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/catalog/pom.xml (original)
+++ oodt/branches/dependency-update/catalog/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-catalog</artifactId>
Modified: oodt/branches/dependency-update/cli/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/cli/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/cli/pom.xml (original)
+++ oodt/branches/dependency-update/cli/pom.xml Fri Sep 25 12:55:12 2015
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-cli</artifactId>
Modified: oodt/branches/dependency-update/commons/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/commons/pom.xml (original)
+++ oodt/branches/dependency-update/commons/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-commons</artifactId>
Modified: oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java (original)
+++ oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java Fri Sep 25 12:55:12 2015
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.oodt.commons.io;
import java.io.File;
Modified: oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java (original)
+++ oodt/branches/dependency-update/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java Fri Sep 25 12:55:12 2015
@@ -59,7 +59,7 @@ public class XMLTest extends TestCase {
String result = XML.serialize(doc);
crc.update(result.getBytes());
long value = crc.getValue();
- assertTrue("Stringified DOM document CRC mismatch, got value = " + value, 3880488030L == value || 2435419114L == value || /* added by Chris Mattmann: pretty print fix */3688328384L == value || /* other newline treatment */ 750262163L == value || 3738296466L == value /* Apache incubator warmed up the file, so it suffered thermal expansion */);
+ assertTrue("Stringified DOM document CRC mismatch, got value = " + value, 3880488030L == value || 2435419114L == value || /* added by Chris Mattmann: pretty print fix */3688328384L == value || /* other newline treatment */ 750262163L == value || 3738296466L == value /* Apache incubator warmed up the file, so it suffered thermal expansion */ || 1102069581L == value /* lewismc and his ALv2 header. */);
}
/** Test the {@link XML#createSAXParser} method.
@@ -85,7 +85,7 @@ public class XMLTest extends TestCase {
java.util.zip.CRC32 crc = new java.util.zip.CRC32();
crc.update(stringWriter.getBuffer().toString().getBytes());
long value = crc.getValue();
- assertTrue("Dumped DOM tree CRC mismatch; got " + value, value == 828793L || value == 2241317601L);
+ assertTrue("Dumped DOM tree CRC mismatch; got " + value, value == 828793L || value == 2241317601L || value == 3208931170L /* lewismc and his ALv2 header */);
}
/** Test the {@link XML#unwrappedText} method. */
Modified: oodt/branches/dependency-update/commons/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/commons/src/test/resources/test.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/commons/src/test/resources/test.xml (original)
+++ oodt/branches/dependency-update/commons/src/test/resources/test.xml Fri Sep 25 12:55:12 2015
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership. The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
<!DOCTYPE log [
<!ELEMENT log (stream*)>
<!ELEMENT stream (streamID, analyst, message*)>
Modified: oodt/branches/dependency-update/core/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/core/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/core/pom.xml (original)
+++ oodt/branches/dependency-update/core/pom.xml Fri Sep 25 12:55:12 2015
@@ -25,7 +25,7 @@ the License.
</parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<name>OODT Core</name>
<packaging>pom</packaging>
<properties>
@@ -36,6 +36,7 @@ the License.
<docsSrc>${basedir}/src/site/xdoc</docsSrc>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <jena.version>3.0.0</jena.version>
</properties>
<url>http://oodt.apache.org/</url>
<issueManagement>
@@ -333,7 +334,7 @@ the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.7</version>
+ <version>1.10</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -354,10 +355,10 @@ the License.
<jdk>1.8</jdk>
</activation>
<build>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.3</version>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
<charset>UTF-8</charset>
@@ -372,13 +373,11 @@ the License.
<goal>javadoc</goal>
</goals>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
-
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
</profile>
<profile>
Modified: oodt/branches/dependency-update/crawler/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/crawler/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/crawler/pom.xml (original)
+++ oodt/branches/dependency-update/crawler/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-crawler</artifactId>
Modified: oodt/branches/dependency-update/filemgr/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/pom.xml (original)
+++ oodt/branches/dependency-update/filemgr/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-filemgr</artifactId>
Modified: oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java (original)
+++ oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java Fri Sep 25 12:55:12 2015
@@ -27,9 +27,11 @@ import org.apache.oodt.cas.filemgr.struc
* A {@link CmdLineAction} which adds a {@link ProductType} to the file manager.
*
* @author bfoster (Brian Foster)
+ * @author riverma (Rishi Verma)
*/
public class AddProductTypeCliAction extends FileManagerCliAction {
+ private String productTypeId;
private String productTypeName;
private String productTypeDescription;
private String fileRepositoryPath;
@@ -39,6 +41,7 @@ public class AddProductTypeCliAction ext
public void execute(ActionMessagePrinter printer)
throws CmdLineActionException {
try {
+ Validate.notNull(productTypeId, "Must specify productTypeId");
Validate.notNull(productTypeName, "Must specify productTypeName");
Validate.notNull(productTypeDescription,
"Must specify productTypeDescription");
@@ -47,6 +50,7 @@ public class AddProductTypeCliAction ext
Validate.notNull(versioner, "Must specify versioner");
ProductType type = new ProductType();
+ type.setProductTypeId(productTypeId);
type.setName(productTypeName);
type.setDescription(productTypeDescription);
type.setProductRepositoryPath(fileRepositoryPath);
@@ -56,13 +60,17 @@ public class AddProductTypeCliAction ext
+ getClient().addProductType(type));
} catch (Exception e) {
throw new CmdLineActionException("Failed to add product type with "
- + "name '" + productTypeName + "', description '"
+ + "id '" + productTypeId + "', name '" + productTypeName + "', description '"
+ productTypeDescription + "', repository '"
+ fileRepositoryPath + ", and versioner '" + versioner + "' : "
+ e.getMessage(), e);
}
}
+ public void setProductTypeId(String productTypeId) {
+ this.productTypeId = productTypeId;
+ }
+
public void setProductTypeName(String productTypeName) {
this.productTypeName = productTypeName;
}
Modified: oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java (original)
+++ oodt/branches/dependency-update/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java Fri Sep 25 12:55:12 2015
@@ -49,6 +49,7 @@ import org.apache.oodt.commons.xml.XMLUt
/**
* @author mattmann
* @author bfoster
+ * @author riverma
* @version $Revision$
*
* <p>
@@ -99,12 +100,11 @@ public final class XmlStructFactory {
repositoryPath = PathUtils.replaceEnvVariables(repositoryPath);
// grab metadata
- Metadata met = null;
+ Metadata met = new Metadata();
Element metadataRoot = XMLUtils.getFirstElement("metadata",
productTypeElem);
if (metadataRoot != null) {
Hashtable<String, Object> metHash = new Hashtable<String, Object>();
- met = new Metadata();
NodeList keyValElems = metadataRoot.getElementsByTagName("keyval");
for (int i = 0; i < keyValElems.getLength(); i++) {
@@ -117,17 +117,18 @@ public final class XmlStructFactory {
}
met.replaceMetadata(metHash);
+ } else {
+ LOG.warning("metadata node missing for product type : "+id);
}
// grab extractors
- List<ExtractorSpec> extractors = null;
+ List<ExtractorSpec> extractors = new Vector<ExtractorSpec>();
Element extractorRoot = XMLUtils.getFirstElement("metExtractors",
productTypeElem);
if (extractorRoot != null) {
NodeList extractorNodes = extractorRoot
.getElementsByTagName("extractor");
- extractors = new Vector<ExtractorSpec>();
if (extractorNodes != null && extractorNodes.getLength() > 0) {
for (int i = 0; i < extractorNodes.getLength(); i++) {
Element extractorElem = (Element) extractorNodes.item(i);
@@ -173,6 +174,8 @@ public final class XmlStructFactory {
}
}
+ } else {
+ LOG.warning("metExtractors node missing from product type : "+id);
}
List<TypeHandler> handlers = null;
Modified: oodt/branches/dependency-update/filemgr/src/main/resources/cmd-line-options.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/main/resources/cmd-line-options.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/main/resources/cmd-line-options.xml (original)
+++ oodt/branches/dependency-update/filemgr/src/main/resources/cmd-line-options.xml Fri Sep 25 12:55:12 2015
@@ -16,6 +16,7 @@
limitations under the License.
Author: bfoster (Brian Foster)
+ riverma (Rishi Verma)
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
@@ -117,6 +118,30 @@
</property>
</bean>
+ <bean id="typeId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+ <property name="shortOption" value="tid" />
+ <property name="longOption" value="typeId" />
+ <property name="description" value="ProductType Id" />
+ <property name="hasArgs" value="true" />
+ <property name="argsDescription" value="product-type-id" />
+ <property name="requirementRules">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+ p:actionName="addProductType" p:relation="REQUIRED" />
+ </list>
+ </property>
+ <property name="handler">
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler">
+ <property name="applyToActions">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+ p:actionName="addProductType" p:methodName="setProductTypeId" />
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
<bean id="typeName" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="tn" />
<property name="longOption" value="typeName" />
Modified: oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java (original)
+++ oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/TestFileManagerCli.java Fri Sep 25 12:55:12 2015
@@ -95,9 +95,10 @@ public class TestFileManagerCli extends
String productTypeDesc = "ProductTypeDesc";
String productTypeRepo = "ProductTypeRepo";
String productTypeVersioner = "ProductTypeVersioner";
+ String productTypeId = "MyProductTypeId";
cmdLineUtility
.run(("--url http://localhost:9000 --operation --addProductType"
- + " --typeName " + productTypeName + " --typeDesc "
+ + " --typeName " + productTypeName + " --typeId "+productTypeId+" --typeDesc "
+ productTypeDesc + " --repository " + productTypeRepo
+ " --versionClass " + productTypeVersioner).split(" "));
MethodCallDetails methodCallDetails = client.getLastMethodCallDetails();
Modified: oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestAddProductTypeCliAction.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestAddProductTypeCliAction.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestAddProductTypeCliAction.java (original)
+++ oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestAddProductTypeCliAction.java Fri Sep 25 12:55:12 2015
@@ -35,6 +35,7 @@ import junit.framework.TestCase;
* Test class for {@link AddProductTypeCliAction}.
*
* @author bfoster (Brian Foster)
+ * @author riverma (Rishi Verma)
*/
public class TestAddProductTypeCliAction extends TestCase {
@@ -74,11 +75,18 @@ public class TestAddProductTypeCliAction
} catch (CmdLineActionException ignore) {
}
cliAction.setVersioner(PRODUCT_TYPE_VERSIONER);
+ try {
+ cliAction.execute(printer);
+ fail("Expected throw CmdLineActionException");
+ } catch (CmdLineActionException ignore) {
+ }
+ cliAction.setProductTypeId(PRODUCT_TYPE_ID);
cliAction.execute(printer); // Should not throw exception.
}
public void testDataFlow() throws CmdLineActionException {
MockAddProductTypeCliAction cliAction = new MockAddProductTypeCliAction();
+ cliAction.setProductTypeId(PRODUCT_TYPE_ID);
cliAction.setProductTypeName(PRODUCT_TYPE_NAME);
cliAction.setProductTypeDescription(PRODUCT_TYPE_DESC);
cliAction.setFileRepositoryPath(PRODUCT_TYPE_REPO);
@@ -90,6 +98,7 @@ public class TestAddProductTypeCliAction
.getPrintedMessages().get(0));
assertEquals("\n", printer.getPrintedMessages().get(1));
+ assertEquals(PRODUCT_TYPE_ID, productTypePassedToClient.getProductTypeId());
assertEquals(PRODUCT_TYPE_NAME, productTypePassedToClient.getName());
assertEquals(PRODUCT_TYPE_DESC,
productTypePassedToClient.getDescription());
Modified: oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java (original)
+++ oodt/branches/dependency-update/filemgr/src/test/java/org/apache/oodt/cas/filemgr/repository/TestXMLRepositoryManager.java Fri Sep 25 12:55:12 2015
@@ -170,8 +170,8 @@ public class TestXMLRepositoryManager ex
}
assertNotNull(type);
- assertNull(type.getTypeMetadata());
-
+ assertNotNull(type.getTypeMetadata());
+ assertEquals(0, type.getTypeMetadata().getKeys().size());
}
/**
Modified: oodt/branches/dependency-update/filemgr/src/test/resources/cmd-line-options.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/filemgr/src/test/resources/cmd-line-options.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/filemgr/src/test/resources/cmd-line-options.xml (original)
+++ oodt/branches/dependency-update/filemgr/src/test/resources/cmd-line-options.xml Fri Sep 25 12:55:12 2015
@@ -16,6 +16,7 @@
limitations under the License.
Author: bfoster (Brian Foster)
+ riverma (Rishi Verma)
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
@@ -117,6 +118,30 @@
</property>
</bean>
+ <bean id="typeId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
+ <property name="shortOption" value="tid" />
+ <property name="longOption" value="typeId" />
+ <property name="description" value="ProductType Id" />
+ <property name="hasArgs" value="true" />
+ <property name="argsDescription" value="product-type-id" />
+ <property name="requirementRules">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
+ p:actionName="addProductType" p:relation="REQUIRED" />
+ </list>
+ </property>
+ <property name="handler">
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler">
+ <property name="applyToActions">
+ <list>
+ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
+ p:actionName="addProductType" p:methodName="setProductTypeId" />
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
<bean id="typeName" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="tn" />
<property name="longOption" value="typeName" />
Modified: oodt/branches/dependency-update/grid/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/grid/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/grid/pom.xml (original)
+++ oodt/branches/dependency-update/grid/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>web-grid</artifactId>
@@ -96,9 +96,10 @@ the License.
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.3</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <type>pom</type>
+ <version>${jena.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: oodt/branches/dependency-update/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java (original)
+++ oodt/branches/dependency-update/grid/src/main/java/org/apache/oodt/grid/ProductQueryServlet.java Fri Sep 25 12:55:12 2015
@@ -24,6 +24,8 @@ import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.oodt.product.HttpRedirectException;
import org.apache.oodt.product.LargeProductQueryHandler;
import org.apache.oodt.product.ProductException;
import org.apache.oodt.product.QueryHandler;
@@ -37,7 +39,7 @@ import org.apache.oodt.xmlquery.XMLQuery
* Product query servlet handles product queries. It always returns the first matching
* product, if any. If no handler can provide a product, it returns 404 Not Found. If
* there are no query handlers, it returns 404 Not Found.
- *
+ *
*/
public class ProductQueryServlet extends QueryServlet {
/** {@inheritDoc} */
@@ -64,8 +66,13 @@ public class ProductQueryServlet extends
}
}
} catch (ProductException ex) {
- res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex.getMessage());
- return;
+ if (ex instanceof HttpRedirectException) {
+ HttpRedirectException hre = (HttpRedirectException) ex;
+ res.sendRedirect(hre.getLocation());
+ } else {
+ res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex.getMessage());
+ }
+ return;
}
res.sendError(HttpServletResponse.SC_NOT_FOUND, "no matching products from any query handler");
Modified: oodt/branches/dependency-update/metadata/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/metadata/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/metadata/pom.xml (original)
+++ oodt/branches/dependency-update/metadata/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-metadata</artifactId>
Modified: oodt/branches/dependency-update/mvn/archetypes/opsui/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/opsui/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/opsui/pom.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/opsui/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>opsui-archetype</artifactId>
Modified: oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/pom.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/pom.xml Fri Sep 25 12:55:12 2015
@@ -64,7 +64,7 @@ the License.
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>pcs-opsui</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.10</version>
<type>war</type>
</dependency>
</dependencies>
Modified: oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/opsui/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml Fri Sep 25 12:55:12 2015
@@ -49,4 +49,30 @@ the License.
<Parameter name="opsui.skin" value=""/>
<Parameter name="opsui.homepage" value="org.apache.oodt.pcs.opsui.HomePage"/>
+
+ <!-- needed by Curation Services -->
+ <Parameter name="org.apache.oodt.cas.curator.metExtractorConf.uploadPath"
+ 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/staging"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.metAreaPath"
+ value="[OODT_HOME]/data/met"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.fmProps"
+ value="[FILEMGR_HOME]/etc/filemgr.properties"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.metExtension"
+ value=".met"/>
+
+ <Parameter name="org.apache.oodt.cas.fm.url"
+ value="[FILEMGR_URL]"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.catalogFactoryClass"
+ value="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory" />
+
</Context>
Modified: oodt/branches/dependency-update/mvn/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/pom.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core</relativePath>
</parent>
Modified: oodt/branches/dependency-update/mvn/archetypes/radix/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/radix/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/radix/pom.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/radix/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>radix-archetype</artifactId>
Modified: oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml (original)
+++ oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml Fri Sep 25 12:55:12 2015
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<assembly>
<id>bin</id>
<formats>
Modified: oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/bin/radix
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/bin/radix?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/bin/radix (original)
+++ oodt/branches/dependency-update/mvn/archetypes/radix/src/main/resources/bin/radix Fri Sep 25 12:55:12 2015
@@ -15,5 +15,5 @@
mvn archetype:generate -DarchetypeGroupId=org.apache.oodt \
-DarchetypeArtifactId=radix-archetype -DarchetypeVersion=0.9 \
- -Doodt=0.9 -DgroupId=com.mycompany \
+ -Doodt=0.10 -DgroupId=com.mycompany \
-DartifactId=oodt -Dversion=0.1
Modified: oodt/branches/dependency-update/mvn/plugins/cas-install/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/mvn/plugins/cas-install/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/mvn/plugins/cas-install/pom.xml (original)
+++ oodt/branches/dependency-update/mvn/plugins/cas-install/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<artifactId>maven-cas-install-plugin</artifactId>
Modified: oodt/branches/dependency-update/opendapps/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/opendapps/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/opendapps/pom.xml (original)
+++ oodt/branches/dependency-update/opendapps/pom.xml Fri Sep 25 12:55:12 2015
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<build>
Modified: oodt/branches/dependency-update/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java (original)
+++ oodt/branches/dependency-update/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java Fri Sep 25 12:55:12 2015
@@ -22,12 +22,14 @@ import java.util.Enumeration;
import java.util.logging.Level;
import java.util.logging.Logger;
+
//OPeNDAP/THREDDS imports
import opendap.dap.Attribute;
import opendap.dap.AttributeTable;
import opendap.dap.DAS;
import opendap.dap.NoSuchAttributeException;
+
//OODT imports
import org.apache.oodt.opendapps.config.OpendapConfig;
import org.apache.oodt.profile.EnumeratedProfileElement;
@@ -119,6 +121,7 @@ public class OpendapProfileElementExtrac
return elem;
}
+ @SuppressWarnings("unchecked")
public EnumeratedProfileElement extractEnumeratedProfileElement(String elemName, String varname,
Profile profile, DAS das)
throws NoSuchAttributeException {
Modified: oodt/branches/dependency-update/pcs/core/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/core/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/core/pom.xml (original)
+++ oodt/branches/dependency-update/pcs/core/pom.xml Fri Sep 25 12:55:12 2015
@@ -22,7 +22,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<name>Process Control System Core Package</name>
Modified: oodt/branches/dependency-update/pcs/input/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/input/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/input/pom.xml (original)
+++ oodt/branches/dependency-update/pcs/input/pom.xml Fri Sep 25 12:55:12 2015
@@ -22,7 +22,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<name>Process Control System Input Data Package</name>
Modified: oodt/branches/dependency-update/pcs/opsui/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/pom.xml (original)
+++ oodt/branches/dependency-update/pcs/opsui/pom.xml Fri Sep 25 12:55:12 2015
@@ -23,7 +23,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<name>Process Control System Operator Interface Webapp</name>
@@ -75,6 +75,12 @@ the License.
<version>${project.parent.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>curator-services</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>pcs-core</artifactId>
@@ -189,6 +195,28 @@ the License.
<debug>true</debug>
</configuration>
</plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <port>8181</port>
+ <systemProperties>
+ <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
+ -server -Xms1536m -Xmx1536m
+ -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
+ -XX:MaxPermSize=512m -XX:+DisableExplicitGC
+ -XX:+UseConcMarkSweepGC
+ -XX:+CMSIncrementalMode
+ -XX:+CMSIncrementalPacing
+ -XX:CMSIncrementalDutyCycleMin=0
+ -XX:-TraceClassUnloading
+ </CATALINA_OPTS>
+ </systemProperties>
+ <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.html Fri Sep 25 12:55:12 2015
@@ -105,6 +105,11 @@
Configuration
</span>
</a>
+ <a href="#" wicket:id="curate_link">
+ <span>
+ Ingest
+ </span>
+ </a>
<a href="#" wicket:id="pcsstatus_link" id="pcsstatus_link" class="last">
<span>
PCS Status
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage.java Fri Sep 25 12:55:12 2015
@@ -22,7 +22,6 @@ package org.apache.oodt.pcs.opsui;
import org.apache.oodt.pcs.opsui.config.ConfigPage;
import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
@@ -98,6 +97,13 @@ public class BasePage extends OPSUIWebPa
}
});
+ add(new Link("curate_link"){
+ @Override
+ public void onClick() {
+ setResponsePage(WorkbenchPage.class);
+ }
+ });
+
add(new ExternalLink("ganglia_link", app.getGangliaUrl()));
add(new ExternalLink("contact_link", "mailto:"+((OpsuiApp)getApplication()).getEmailContactLink()));
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_classic.html Fri Sep 25 12:55:12 2015
@@ -198,6 +198,13 @@
style="color: white; font-weight: bold;">
Configuration </span> </a>
</td>
+ <td id="menu_inner_tbl_links_cfg"
+ onMouseOver="menuSelected($(this))"
+ onMouseOut="menuNotSelected($(this))"><a href="#"
+ wicket:id="curate_link" class="blackLink"> <span
+ style="color: white; font-weight: bold;">
+ Ingest </span> </a>
+ </td>
<td id="menu_inner_tbl_links_pcsstat"
onMouseOver="menuSelected($(this))"
onMouseOut="menuNotSelected($(this))"><a href="#"
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.html
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.html?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.html (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/BasePage_cleanwhite.html Fri Sep 25 12:55:12 2015
@@ -106,6 +106,11 @@
Configuration
</span>
</a>
+ <a href="#" wicket:id="curate_link">
+ <span>
+ Ingest
+ </span>
+ </a>
<a href="#" wicket:id="pcsstatus_link" id="pcsstatus_link" class="last">
<span>
PCS Status
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.html Fri Sep 25 12:55:12 2015
@@ -50,6 +50,11 @@
Configuration
</span>
</a>
+ <a href="#" wicket:id="curate_link">
+ <span>
+ Ingest
+ </span>
+ </a>
<a href="#" wicket:id="pcsstatus_link" id="pcsstatus_link">
<span>
PCS Status
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/HomePage.java Fri Sep 25 12:55:12 2015
@@ -22,7 +22,6 @@ package org.apache.oodt.pcs.opsui;
import org.apache.oodt.pcs.opsui.config.ConfigPage;
import org.apache.oodt.pcs.opsui.status.StatusPage;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
@@ -89,6 +88,14 @@ public class HomePage extends OPSUIWebPa
params.add("tab", "File Manager");
setResponsePage(ConfigPage.class, params);
}
- });
+ });
+
+ add(new Link("curate_link"){
+ @Override
+ public void onClick() {
+ setResponsePage(WorkbenchPage.class);
+ }
+ });
+
}
}
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java Fri Sep 25 12:55:12 2015
@@ -20,11 +20,15 @@ package org.apache.oodt.pcs.opsui;
//OODT imports
import java.io.Serializable;
import java.util.List;
+import java.util.Set;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.servlet.ServletContext;
import org.apache.oodt.cas.metadata.util.PathUtils;
+import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
import org.apache.oodt.cas.webcomponents.filemgr.FMBrowserSession;
import org.apache.oodt.cas.webcomponents.workflow.instance.WorkflowInstancesViewer;
import org.apache.oodt.pcs.opsui.config.ConfigPage;
@@ -39,6 +43,7 @@ import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
+import org.apache.wicket.util.file.File;
/**
*
@@ -51,6 +56,8 @@ import org.apache.wicket.request.target.
public class OpsuiApp extends WebApplication implements Serializable {
private static final long serialVersionUID = 1403288657369282259L;
+
+ private static final Logger LOG = Logger.getLogger(OpsuiApp.class.getName());
public OpsuiApp() {
MixedParamUrlCodingStrategy types = new MixedParamUrlCodingStrategy(
@@ -83,6 +90,9 @@ public class OpsuiApp extends WebApplica
MixedParamUrlCodingStrategy configPageMount = new MixedParamUrlCodingStrategy("config",
ConfigPage.class, new String [] {"tab"});
+ MixedParamUrlCodingStrategy curateMount = new MixedParamUrlCodingStrategy("curate",
+ WorkbenchPage.class, new String[]{});
+
mount(pcsStatus);
mount(types);
mount(typeBrowser);
@@ -93,6 +103,7 @@ public class OpsuiApp extends WebApplica
mount(workflowsPageMount);
mount(workflowInstsPageMount);
mount(configPageMount);
+ mount(curateMount);
}
/*
@@ -252,7 +263,24 @@ public class OpsuiApp extends WebApplica
mountSharedResource("/images/tab_bottom.gif", new ResourceReference(ConfigPage.class,
"tab_bottom.gif").getSharedResourceKey());
+
+
+ Set<String> benchResources = Workbench.getImageFiles();
+ doImageMounts(benchResources, Workbench.class);
}
+
+ private void doImageMounts(Set<String> resources, Class<?> clazz) {
+ if (resources != null) {
+ for (String resource : resources) {
+ String resName = new File(resource).getName();
+ String resPath = "/images/" + resName;
+ LOG.log(Level.INFO, "Mounting: [" + resPath + "] origName: [" + resName
+ + "]: resource: [" + resource + "]");
+ mountSharedResource(resPath,
+ new ResourceReference(clazz, resName).getSharedResourceKey());
+ }
+ }
+ }
}
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/webapp/META-INF/context.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/webapp/META-INF/context.xml (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/webapp/META-INF/context.xml Fri Sep 25 12:55:12 2015
@@ -62,7 +62,38 @@ the License.
"classic" => The original, OCO (Orbiting Carbon Observatory) skin for OPSUI
OR add your own!
-->
- <Parameter name="opsui.skin" value="cleanwhite"/>
+ <Parameter name="opsui.skin" value=""/>
+
+ <!--
+ if you use the classic skin, change the home page to
+ org.apache.oodt.pcs.opsui.status.StatusPage
+ -->
<Parameter name="opsui.homepage" value="org.apache.oodt.pcs.opsui.HomePage"/>
+
+
+ <!-- needed by Curation Services -->
+ <Parameter name="org.apache.oodt.cas.curator.metExtractorConf.uploadPath"
+ 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/staging"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.metAreaPath"
+ value="[OODT_HOME]/data/met"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.fmProps"
+ value="[FILEMGR_HOME]/etc/filemgr.properties"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.metExtension"
+ value=".met"/>
+
+ <Parameter name="org.apache.oodt.cas.fm.url"
+ value="[FILEMGR_URL]"/>
+
+ <Parameter name="org.apache.oodt.cas.curator.catalogFactoryClass"
+ value="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory" />
</Context>
Modified: oodt/branches/dependency-update/pcs/opsui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/opsui/src/main/webapp/WEB-INF/web.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/opsui/src/main/webapp/WEB-INF/web.xml (original)
+++ oodt/branches/dependency-update/pcs/opsui/src/main/webapp/WEB-INF/web.xml Fri Sep 25 12:55:12 2015
@@ -70,6 +70,38 @@
<url-pattern>/dataset</url-pattern>
</servlet-mapping>
-
+ <!-- needed by Curation Services -->
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <servlet-class>
+ org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
+ </servlet-class>
+ <init-param>
+ <param-name>jaxrs.serviceClasses</param-name>
+ <param-value>
+ org.apache.oodt.cas.curation.service.DirectoryResource,
+ org.apache.oodt.cas.curation.service.IngestionResource,
+ org.apache.oodt.cas.curation.service.MetadataResource,
+ org.apache.oodt.cas.curation.service.PolicyResource,
+ org.apache.oodt.cas.curation.service.SystemResource
+ </param-value>
+ </init-param>
+ <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>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: oodt/branches/dependency-update/pcs/services/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pcs/services/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pcs/services/pom.xml (original)
+++ oodt/branches/dependency-update/pcs/services/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.oodt</groupId>
Modified: oodt/branches/dependency-update/pge/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pge/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pge/pom.xml (original)
+++ oodt/branches/dependency-update/pge/pom.xml Fri Sep 25 12:55:12 2015
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-pge</artifactId>
Modified: oodt/branches/dependency-update/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/pom.xml (original)
+++ oodt/branches/dependency-update/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,11 +20,10 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>core/pom.xml</relativePath>
</parent>
- <groupId>org.apache.oodt</groupId>
<artifactId>oodt</artifactId>
<name>Apache OODT</name>
<packaging>pom</packaging>
@@ -56,7 +55,8 @@ the License.
<module>workflow</module>
<module>crawler</module>
<module>resource</module>
- <!-- <module>curator</module> -->
+ <module>curator/services</module>
+ <module>curator/webapp</module>
<module>pge</module>
<module>mvn/plugins/cas-install</module>
<module>mvn/archetypes</module>
Modified: oodt/branches/dependency-update/product/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/product/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/product/pom.xml (original)
+++ oodt/branches/dependency-update/product/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-product</artifactId>
Modified: oodt/branches/dependency-update/profile/pom.xml
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/profile/pom.xml (original)
+++ oodt/branches/dependency-update/profile/pom.xml Fri Sep 25 12:55:12 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-profile</artifactId>
@@ -101,9 +101,10 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.3</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <type>pom</type>
+ <version>${jena.version}</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
Modified: oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java (original)
+++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java Fri Sep 25 12:55:12 2015
@@ -20,13 +20,15 @@ package org.apache.oodt.profile;
import java.util.ArrayList;
import java.util.List;
-import org.apache.oodt.commons.util.XML;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
+
import java.net.URI;
import java.util.Iterator;
+
import org.w3c.dom.Element;
/**
@@ -42,7 +44,7 @@ public class EnumeratedProfileElement ex
*/
public EnumeratedProfileElement(Profile profile) {
super(profile);
- values = new ArrayList();
+ values = new ArrayList<Object>();
}
/**
@@ -61,7 +63,7 @@ public class EnumeratedProfileElement ex
* @param values Valid values.
*/
public EnumeratedProfileElement(Profile profile, String name, String id, String desc, String type, String unit,
- List synonyms, boolean obligation, int maxOccurrence, String comment, List values) {
+ List<?> synonyms, boolean obligation, int maxOccurrence, String comment, List<?> values) {
super(profile, name, id, desc, type, unit, synonyms, obligation, maxOccurrence, comment);
if (values.contains(null))
throw new IllegalArgumentException("Null item in 'values' not allowed for enumerated profile elements");
@@ -74,7 +76,7 @@ public class EnumeratedProfileElement ex
protected void addValues(Node node) throws DOMException {
if (values == null) return;
- for (Iterator i = values.iterator(); i.hasNext();) {
+ for (Iterator<?> i = values.iterator(); i.hasNext();) {
Element e = node.getOwnerDocument().createElement("elemValue");
e.appendChild(node.getOwnerDocument().createCDATASection((String) i.next()));
node.appendChild(e);
@@ -98,5 +100,5 @@ public class EnumeratedProfileElement ex
}
/** Valid values. */
- protected List values;
+ protected List<?> values;
}
Modified: oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Profile.java
URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Profile.java?rev=1705287&r1=1705286&r2=1705287&view=diff
==============================================================================
--- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Profile.java (original)
+++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Profile.java Fri Sep 25 12:55:12 2015
@@ -18,20 +18,18 @@
package org.apache.oodt.profile;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import java.io.IOException;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
+
import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.oodt.commons.Configuration;
+
import org.apache.oodt.commons.util.Documentable;
import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
@@ -41,7 +39,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.OutputStreamWriter;
@@ -53,7 +51,7 @@ import java.io.OutputStreamWriter;
*
* @author Kelly
*/
-public class Profile implements Serializable, Cloneable, Comparable, Documentable {
+public class Profile implements Serializable, Cloneable, Comparable<Object>, Documentable {
/** Serial version unique ID. */
static final long serialVersionUID = -3936851809184360591L;
@@ -70,8 +68,8 @@ public class Profile implements Serializ
* @param factory Factory for creation of profile-related objects.
* @return A list of profiles.
*/
- public static List createProfiles(Element root, ObjectFactory factory) {
- List profiles = new ArrayList();
+ public static List<Profile> createProfiles(Element root, ObjectFactory factory) {
+ List<Profile> profiles = new ArrayList<Profile>();
if ("profile".equals(root.getNodeName()))
// The root is a <profile>, so add the single profile to the list.
profiles.add(factory.createProfile((Element) root));
@@ -99,7 +97,7 @@ public class Profile implements Serializ
* @param root Either a <profiles> or a <profile> element.
* @return A list of profiles.
*/
- public static List createProfiles(Element root) {
+ public static List<Profile> createProfiles(Element root) {
return createProfiles(root, new DefaultFactory());
}
@@ -251,7 +249,7 @@ public class Profile implements Serializ
*
* @return The profile elements.
*/
- public Map getProfileElements() {
+ public Map<String, ProfileElement> getProfileElements() {
return elements;
}
@@ -271,7 +269,7 @@ public class Profile implements Serializ
public void addToModel(Model model) {
Resource resource = model.createResource(getURI().toString());
resAttr.addToModel(model, resource, profAttr);
- for (Iterator i = elements.values().iterator(); i.hasNext();) {
+ for (Iterator<ProfileElement> i = elements.values().iterator(); i.hasNext();) {
ProfileElement e = (ProfileElement) i.next();
e.addToModel(model, resource, profAttr);
}
@@ -311,7 +309,7 @@ public class Profile implements Serializ
Element profile = doc.createElement("profile");
profile.appendChild(profAttr.toXML(doc));
profile.appendChild(resAttr.toXML(doc));
- if (withElements) for (Iterator i = elements.values().iterator(); i.hasNext();)
+ if (withElements) for (Iterator<ProfileElement> i = elements.values().iterator(); i.hasNext();)
profile.appendChild(((ProfileElement) i.next()).toXML(doc));
return profile;
}
@@ -356,7 +354,7 @@ public class Profile implements Serializ
*
* This mapping is from element name (a {@link String}) to {@link ProfileElement}.
*/
- protected Map elements = new HashMap();
+ protected Map<String, ProfileElement> elements = new HashMap<String, ProfileElement>();
/**
* Try to parse an XML profile in a file in its XML vocabulary. If successful,