You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ke...@apache.org on 2010/07/16 04:44:06 UTC
svn commit: r964658 - in
/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile: ./
activity/ gui/ gui/pstructs/ handlers/ handlers/cas/ handlers/cas/util/
handlers/lightweight/ handlers/oracle/
Author: kelly
Date: Fri Jul 16 02:44:04 2010
New Revision: 964658
URL: http://svn.apache.org/viewvc?rev=964658&view=rev
Log:
Partial commit to work around svn checksum issue
Added:
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java (with props)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java (with props)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java (with props)
Removed:
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/oracle/
Modified:
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/ProfileBuilderGUI.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/profileTree.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java (contents, props changed)
incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/package.html (props changed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,11 +16,11 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import java.util.ArrayList;
import java.util.List;
-import jpl.eda.util.XML;
+import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import com.hp.hpl.mesa.rdf.jena.model.Model;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
('svn:executable' removed)
Added: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java?rev=964658&view=auto
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java (added)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java Fri Jul 16 02:44:04 2010
@@ -0,0 +1,109 @@
+// 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.
+
+package org.apache.oodt.profile;
+
+import java.util.List;
+import org.w3c.dom.Element;
+
+/**
+ * Factory to create profile-related objects.
+ *
+ * @author Kelly
+ * @version $Revision: 1.1.1.1 $
+ */
+public interface ObjectFactory {
+ /**
+ * Create a ranged profile element.
+ *
+ * @param profile a <code>Profile</code> value.
+ * @param name a <code>String</code> value.
+ * @param id a <code>String</code> value.
+ * @param desc a <code>String</code> value.
+ * @param type a <code>String</code> value.
+ * @param unit a <code>String</code> value.
+ * @param synonyms a <code>List</code> value.
+ * @param obligation a <code>boolean</code> value.
+ * @param maxOccurrence an <code>int</code> value.
+ * @param comments a <code>String</code> value.
+ * @param min a <code>double</code> value.
+ * @param max a <code>double</code> value.
+ * @return a <code>RangedProfileElement</code> value.
+ */
+ RangedProfileElement createRangedProfileElement(Profile profile, String name, String id, String desc, String type,
+ String unit, List synonyms, boolean obligation, int maxOccurrence, String comments, String min, String max);
+
+ /**
+ * Create a profile element with unspecified values.
+ *
+ * @param profile a <code>Profile</code> value.
+ * @param name a <code>String</code> value.
+ * @param id a <code>String</code> value.
+ * @param desc a <code>String</code> value.
+ * @param type a <code>String</code> value.
+ * @param unit a <code>String</code> value.
+ * @param synonyms a <code>List</code> value.
+ * @param obligation a <code>boolean</code> value.
+ * @param maxOccurrence an <code>int</code> value.
+ * @param comments a <code>String</code> value.
+ * @return an <code>UnspecifiedProfileElement</code> value.
+ */
+ UnspecifiedProfileElement createUnspecifiedProfileElement(Profile profile, String name, String id, String desc, String type,
+ String unit, List synonyms, boolean obligation, int maxOccurrence, String comments);
+
+ /**
+ * Create a profile element with enumerated values.
+ *
+ * @param profile a <code>Profile</code> value.
+ * @param name a <code>String</code> value.
+ * @param id a <code>String</code> value.
+ * @param desc a <code>String</code> value.
+ * @param type a <code>String</code> value.
+ * @param unit a <code>String</code> value.
+ * @param synonyms a <code>List</code> value.
+ * @param obligation a <code>boolean</code> value.
+ * @param maxOccurrence an <code>int</code> value.
+ * @param comments a <code>String</code> value.
+ * @param values a <code>List</code> value.
+ * @return an <code>Enumerated</code> value.
+ */
+ EnumeratedProfileElement createEnumeratedProfileElement(Profile profile, String name, String id, String desc, String type,
+ String unit, List synonyms, boolean obligation, int maxOccurrence, String comments, List values);
+
+ /**
+ * Create a profile from a DOM node.
+ *
+ * @param node an <code>Element</code> value.
+ * @return a <code>Profile</code> value.
+ */
+ Profile createProfile(Element node);
+
+ /**
+ * Create profile attributes from a DOM node.
+ *
+ * @param node an <code>Element</code> value.
+ * @return a <code>ProfileAttributes</code> value.
+ */
+ ProfileAttributes createProfileAttributes(Element node);
+
+ /**
+ * Create resource attributes from a DOM node.
+ *
+ * @param profile Owning profile.
+ * @param node an <code>Element</code> value.
+ * @return a <code>ResourceAttributes</code> value.
+ */
+ ResourceAttributes createResourceAttributes(Profile profile, Element node);
+}
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ObjectFactory.java
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import com.hp.hpl.mesa.rdf.jena.mem.ModelMem;
import com.hp.hpl.mesa.rdf.jena.model.Model;
@@ -32,9 +32,9 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import jpl.eda.Configuration;
-import jpl.eda.util.Documentable;
-import jpl.eda.util.XML;
+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;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java Fri Jul 16 02:44:04 2010
@@ -16,14 +16,14 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import jpl.eda.util.Documentable;
-import jpl.eda.util.XML;
-import jpl.eda.Configuration;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
+import org.apache.oodt.commons.Configuration;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileAttributes.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import com.hp.hpl.mesa.rdf.jena.model.Model;
import com.hp.hpl.mesa.rdf.jena.model.RDFException;
@@ -28,8 +28,8 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import jpl.eda.util.Documentable;
-import jpl.eda.util.XML;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
/**
* A profile-related exception.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileException.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import org.xml.sax.SAXException;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileSAXException.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,12 +16,12 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import jpl.eda.util.XML;
+import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import com.hp.hpl.mesa.rdf.jena.model.RDFException;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import com.hp.hpl.mesa.rdf.jena.mem.ModelMem;
import com.hp.hpl.mesa.rdf.jena.model.Model;
@@ -27,10 +27,10 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import jpl.eda.Configuration;
-import jpl.eda.xmlquery.Result;
-import jpl.eda.util.Documentable;
-import jpl.eda.util.XML;
+import org.apache.oodt.commons.Configuration;
+import org.apache.oodt.xmlquery.Result;
+import org.apache.oodt.commons.util.Documentable;
+import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile;
+package org.apache.oodt.profile;
import java.io.Serializable;
import java.util.Collections;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java Fri Jul 16 02:44:04 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.profile.activity;
+package org.apache.oodt.profile.activity;
-import jpl.eda.activity.Incident;
+import org.apache.oodt.commons.activity.Incident;
public class ConnectedToServer extends Incident {
/** Serial version unique ID */
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ConnectedToServer.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java Fri Jul 16 02:44:04 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.profile.activity;
+package org.apache.oodt.profile.activity;
-import jpl.eda.activity.Incident;
+import org.apache.oodt.commons.activity.Incident;
public class ProfileClientConstructed extends Incident {
/** Serial version unique ID. */
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ProfileClientConstructed.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java Fri Jul 16 02:44:04 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.profile.activity;
+package org.apache.oodt.profile.activity;
-import jpl.eda.activity.Incident;
+import org.apache.oodt.commons.activity.Incident;
public class QueriedHandlers extends Incident {
/** Serial version unique ID. */
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/QueriedHandlers.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java Fri Jul 16 02:44:04 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.profile.activity;
+package org.apache.oodt.profile.activity;
-import jpl.eda.activity.Incident;
+import org.apache.oodt.commons.activity.Incident;
public class ReceivedQuery extends Incident {
/** Serial version unique ID. */
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/activity/ReceivedQuery.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/LeafListener.java Fri Jul 16 02:44:04 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package jpl.eda.profile.gui;
+package org.apache.oodt.profile.gui;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -31,9 +31,9 @@ import javax.swing.JPopupMenu;
import java.util.Iterator;
-import jpl.eda.profile.ProfileElement;
-import jpl.eda.profile.EnumeratedProfileElement;
-import jpl.eda.profile.Profile;
+import org.apache.oodt.profile.ProfileElement;
+import org.apache.oodt.profile.EnumeratedProfileElement;
+import org.apache.oodt.profile.Profile;
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/ProfileBuilderGUI.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/ProfileBuilderGUI.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/ProfileBuilderGUI.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/ProfileBuilderGUI.java Fri Jul 16 02:44:04 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package jpl.eda.profile.gui;
+package org.apache.oodt.profile.gui;
import javax.swing.JSeparator;
import javax.swing.JMenuItem;
@@ -33,12 +33,12 @@ import javax.swing.tree.TreeNode;
import javax.swing.tree.TreeModel;
import javax.swing.JFileChooser;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileElement;
-import jpl.eda.profile.RangedProfileElement;
-import jpl.eda.profile.gui.profileTree;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileElement;
+import org.apache.oodt.profile.RangedProfileElement;
+import org.apache.oodt.profile.gui.profileTree;
-import jpl.eda.profile.gui.pstructs.ProfilePrinter;
+import org.apache.oodt.profile.gui.pstructs.ProfilePrinter;
import java.util.Iterator;
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/profileTree.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/profileTree.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/profileTree.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/profileTree.java Fri Jul 16 02:44:04 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package jpl.eda.profile.gui;
+package org.apache.oodt.profile.gui;
import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode;
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileAttributesPrinter.java Fri Jul 16 02:44:04 2010
@@ -21,10 +21,10 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package jpl.eda.profile.gui.pstructs;
+package org.apache.oodt.profile.gui.pstructs;
-import jpl.eda.profile.ProfileAttributes;
+import org.apache.oodt.profile.ProfileAttributes;
import java.util.Iterator;
/**
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfileElementPrinter.java Fri Jul 16 02:44:04 2010
@@ -21,9 +21,9 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package jpl.eda.profile.gui.pstructs;
+package org.apache.oodt.profile.gui.pstructs;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.ProfileElement;
import java.util.Iterator;
/**
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ProfilePrinter.java Fri Jul 16 02:44:04 2010
@@ -21,11 +21,11 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package jpl.eda.profile.gui.pstructs;
+package org.apache.oodt.profile.gui.pstructs;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileElement;
import java.util.Iterator;
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/gui/pstructs/ResourceAttributesPrinter.java Fri Jul 16 02:44:04 2010
@@ -21,9 +21,9 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package jpl.eda.profile.gui.pstructs;
+package org.apache.oodt.profile.gui.pstructs;
-import jpl.eda.profile.ResourceAttributes;
+import org.apache.oodt.profile.ResourceAttributes;
import java.util.Iterator;
/**
Added: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java?rev=964658&view=auto
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java (added)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java Fri Jul 16 02:44:04 2010
@@ -0,0 +1,283 @@
+// 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.
+
+package org.apache.oodt.profile.handlers;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.sql.*;
+import java.util.*;
+import org.apache.oodt.commons.Configuration;
+import org.apache.oodt.commons.util.DOMParser;
+import org.apache.oodt.commons.util.*;
+import org.apache.oodt.xmlquery.*;
+import org.w3c.dom.*;
+import org.xml.sax.*;
+import org.apache.oodt.profile.*;
+
+/**********************************************************************************
+**
+** DatabaseProfileManager.java
+**
+** @author Dan Crichton
+**
+** date: 11/10/2000
+**
+** description: Map a profile into/out of a relational database
+**
+***********************************************************************************/
+
+public abstract class DatabaseProfileManager implements ProfileManager
+{
+ /** Add an element to the given node in an XML document.
+ *
+ * @param node To what node to add a new element.
+ * @param name What the new element should be named.
+ * @param value What string value the element should contain; if null, then don't add the element.
+ * @throws DOMException If an error occurs.
+ */
+ private static void add(Node node, String name, String value) throws DOMException {
+ if (value == null) return;
+ XML.add(node, name, value.trim());
+ }
+
+ /** Dump profiles in the database.
+ *
+ * This returns a list containing the contents of the profiles.
+ *
+ * @return The profiles in the database, as a list.
+ * @throws ProfileException If an error occurs.
+ */
+ public abstract List getProfiles(Connection conn) throws ProfileException;
+
+ Connection conn;
+ Properties props;
+
+
+ /**********************************************************************
+ **
+ ** DatabaseProfileManager
+ **
+ **
+ ***********************************************************************/
+
+ public DatabaseProfileManager(Properties props) throws SQLException, Exception {
+ this(props, openConnection(props));
+ }
+
+ public DatabaseProfileManager (Properties props, Connection conn)
+ {
+ this.conn = conn;
+ this.props = props;
+ }
+
+
+ /**********************************************************************
+ **
+ ** findProfiles
+ **
+ ** Returns a list of matching profiles
+ **
+ ***********************************************************************/
+ public List findProfiles(XMLQuery query) throws DOMException, ProfileException
+ {
+ try
+ {
+ return(findProfiles(conn, query));
+ }
+ catch (Exception e)
+ {
+ throw new ProfileException (e.getMessage());
+ }
+ }
+
+ public abstract List findProfiles(Connection conn, XMLQuery query) throws DOMException, ProfileException;
+
+
+ public void add(Profile profile) throws ProfileException {
+
+ try
+ {
+ add(conn, profile);
+ conn.commit();
+ }
+ catch (SQLException e)
+ {
+ throw new ProfileSQLException (e);
+ }
+ }
+ public abstract void add(Connection conn, Profile profile) throws ProfileException ;
+
+
+ public void addAll(Collection collection) throws ProfileException
+ {
+ try
+ {
+ addAll(conn, collection);
+ conn.commit();
+ }
+ catch (Exception e)
+ {
+ try {
+ conn.rollback();
+ }catch (SQLException se) {
+ throw new ProfileSQLException(se);
+ }
+ throw new ProfileException(e.getMessage());
+ }
+ }
+
+ public abstract void addAll(Connection conn,Collection collection) throws ProfileException;
+
+ public abstract void clear(Connection conn) throws ProfileException ;
+
+ public void clear() throws ProfileException
+ {
+ // Create database connection
+
+ try
+ {
+ clear(conn);
+ conn.commit();
+ }
+ catch (SQLException e)
+ {
+ throw new ProfileSQLException (e);
+ }
+ }
+ public boolean contains(Profile profile) throws ProfileException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+ public boolean containsAll(Collection collection) throws ProfileException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ public abstract Profile get(Connection conn, String profID) throws ProfileException;
+
+ public Profile get(String profId) throws ProfileException {
+ // Create database connection
+
+ try
+ {
+ return(get(conn, profId));
+ }
+ catch (ProfileException e)
+ {
+ throw e;
+ }
+ }
+
+ public Collection getAll() throws ProfileException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+ public boolean isEmpty() throws ProfileException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+ public Iterator iterator() throws ProfileException {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ public abstract boolean remove(Connection conn, String profId, String version)
+ throws ProfileException;
+
+ public abstract boolean remove(Connection conn, String profId) throws ProfileException;
+
+
+ public boolean remove(String profId, String version) throws ProfileException
+ {
+ // Create database connection
+
+ try
+ {
+ boolean status = remove(conn, profId, version);
+ conn.commit();
+ return(status);
+ }
+ catch (SQLException e)
+ {
+ throw new ProfileSQLException (e);
+ }
+ }
+
+ public boolean remove(String profId) throws ProfileException {
+ // Create database connection
+
+ try
+ {
+ boolean status = remove(conn, profId);
+ conn.commit();
+ return(status);
+ }
+ catch (SQLException e)
+ {
+ throw new ProfileSQLException (e);
+ }
+ }
+
+ public int size() throws ProfileException {
+ try
+ {
+ return(size(conn));
+ }
+ catch (ProfileException e)
+ {
+ throw e;
+ }
+
+ }
+
+ public abstract int size(Connection conn) throws ProfileException ;
+
+ public void replace(Profile profile) throws ProfileException {
+ // Create database connection
+
+ try
+ {
+ replace(conn, profile);
+ conn.commit();
+ }
+ catch (Exception e)
+ {
+ throw new ProfileException(e.getMessage());
+ }
+ }
+ public abstract void replace(Connection conn, Profile profile) throws ProfileException ;
+
+ protected static Connection openConnection(Properties props) throws SQLException, ProfileException
+ {
+ // load JDBC driver
+ String driver = props.getProperty("org.apache.oodt.util.JDBC_DB.driver","oracle.jdbc.driver.OracleDriver");
+ try {
+ System.err.println("Attempting to load class " + driver);
+ Class.forName(driver);
+ System.err.println("Loaded " + driver);
+ } catch (ClassNotFoundException e) {
+ throw new ProfileException("Can't load JDBC driver \"" + driver + "\": " +e.getMessage());
+ }
+
+ // get connection
+ String url = props.getProperty("org.apache.oodt.util.JDBC_DB.url", "jdbc:oracle:@");
+ String database = props.getProperty("org.apache.oodt.util.JDBC_DB.database");
+ if(database != null) url += database;
+
+ Connection conn = DriverManager.getConnection(url,
+ props.getProperty("org.apache.oodt.util.JDBC_DB.user"),
+ props.getProperty("org.apache.oodt.util.JDBC_DB.password"));
+
+ conn.setAutoCommit(false);
+ return conn;
+ }
+}
+
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/DatabaseProfileManager.java
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java Fri Jul 16 02:44:04 2010
@@ -16,13 +16,13 @@
*/
-package jpl.eda.profile.handlers;
+package org.apache.oodt.profile.handlers;
import java.util.Collection;
import java.util.List;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileException;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileException;
+import org.apache.oodt.xmlquery.XMLQuery;
import org.w3c.dom.Document;
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileHandler.java
('svn:executable' removed)
Added: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java?rev=964658&view=auto
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java (added)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java Fri Jul 16 02:44:04 2010
@@ -0,0 +1,150 @@
+// 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.
+
+package org.apache.oodt.profile.handlers;
+
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileException;
+import org.apache.oodt.xmlquery.XMLQuery;
+import org.w3c.dom.Document;
+
+/**
+ * Interface of a profile manager.
+ *
+ * A profile manager can manage profiles by adding, removing, and manipulating them---in
+ * addition to searching them.
+ *
+ * @author Kelly
+ * @version $Revision: 1.1.1.1 $
+ */
+public interface ProfileManager extends ProfileHandler {
+ /**
+ * Add a profile into the set of profiles managed by this profile server.
+ *
+ * @param profile The profile to add or replace.
+ * @throws ProfileException If any error occurs.
+ */
+ void add(Profile profile) throws ProfileException;
+
+ /**
+ * Add all of the profiles in the given collection to the set managed by this
+ * server.
+ *
+ * Any profiles that already exist (as identified by their profile IDs) are replaced.
+ *
+ * @param collection Collection of {@link Profile}s to add.
+ * @throws ProfileException If any error occurs.
+ */
+ void addAll(Collection collection) throws ProfileException;
+
+ /**
+ * Clear all profiles.
+ *
+ * This irrevocably removes all profiles from the server, leaving it with none.
+ *
+ * @throws ProfileException If any error occurs.
+ */
+ void clear() throws ProfileException;
+
+ /**
+ * Tell if the given profile is managed by this server.
+ *
+ * @param profile The profile to check.
+ * @return True if <var>profile</var> is present in the server, false otherwise.
+ * @throws ProfileException If any error occurs.
+ */
+ boolean contains(Profile profile) throws ProfileException;
+
+ /**
+ * Tell if the given collection of profiles are managed by this server.
+ *
+ * @param collection The collection of {@link Profile}s to check.
+ * @return True if every {@link Profile} in <var>collection</var> are present in
+ * the server, false otherwise.
+ * @throws ProfileException If any error occurs.
+ */
+ boolean containsAll(Collection collection) throws ProfileException;
+
+ /**
+ * Get all profiles.
+ *
+ * @return A collection of profiles
+ * @throws ProfileException If any error occurs.
+ */
+ Collection getAll() throws ProfileException;
+
+ /**
+ * Tell if the set of profiles managed by this server is empty.
+ *
+ * @return True if there are no profiles in this server.
+ * @throws ProfileException If any error occurs.
+ */
+ boolean isEmpty() throws ProfileException;
+
+ /**
+ * Iterate over the available profiles.
+ *
+ * Each call to <code>next</code> yields a copy of the next {@link Profile} object
+ * managed by this server. Updates to profile objects are not backed by the
+ * server; make your updates and then call {@link #add}.
+ *
+ * @return An iterator over {@link Profile}s.
+ * @throws ProfileException If any error occurs.
+ */
+ Iterator iterator() throws ProfileException;
+
+ /**
+ * Remove the profile with the given ID.
+ *
+ * This removes forever the given profile from the set of profiles managed by this
+ * server.
+ *
+ * @param profID What profile to remove.
+ * @param version What version of the the profile identified by <var>profID</var> to remove.
+ * @return True if thie profile was actually present and removed; false if it wasn't present.
+ * @throws ProfileException If any error occurs.
+ */
+ boolean remove(String profID, String version) throws ProfileException;
+
+ /**
+ * Remove the profile with the given ID.
+ *
+ * This removes forever the given profile from the set of profiles managed by this
+ * server.
+ *
+ * @param profID ID of profile to remove.
+ * @return True if thie profile was actually present and removed; false if it wasn't present.
+ * @throws ProfileException If any error occurs.
+ */
+ boolean remove(String profID) throws ProfileException;
+
+ /**
+ * Get the size of the set of profiles managed by this server.
+ *
+ * @return The number of available profiles.
+ * @throws ProfileException If any error occurs.
+ */
+ int size() throws ProfileException;
+
+ /**
+ * Replace a profile into the set of profiles managed by this profile server.
+ *
+ * @param profile The profile to add or replace.
+ * @throws ProfileException If any error occurs.
+ */
+ void replace(Profile profile) throws ProfileException;
+}
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/ProfileManager.java
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java Fri Jul 16 02:44:04 2010
@@ -16,17 +16,17 @@
*/
-package gov.nasa.jpl.oodt.cas.profile;
+package org.apache.oodt.cas.profile;
//CAS imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Query;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.profile.util.ProfileUtils;
+import org.apache.oodt.cas.filemgr.structs.Element;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Query;
+import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.profile.util.ProfileUtils;
//JDK imports
import java.net.URL;
@@ -37,11 +37,11 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileException;
-import jpl.eda.profile.handlers.ProfileHandler;
-import jpl.eda.xmlquery.QueryElement;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileException;
+import org.apache.oodt.profile.handlers.ProfileHandler;
+import org.apache.oodt.xmlquery.QueryElement;
+import org.apache.oodt.xmlquery.XMLQuery;
/**
* @author mattmann
@@ -74,7 +74,7 @@ public class CASProfileHandler implement
// telling us which filemgr to communicate with
String filemgrUrlStr = System.getProperty(
- "gov.nasa.jpl.oodt.cas.profile.fmUrl", "http://localhost:9000");
+ "org.apache.oodt.cas.profile.fmUrl", "http://localhost:9000");
try {
fmClient = new XmlRpcFileManagerClient(new URL(filemgrUrlStr));
@@ -86,18 +86,18 @@ public class CASProfileHandler implement
// read in data deliv base url
dataDelivBaseUrlStr = System.getProperty(
- "gov.nasa.jpl.oodt.cas.profile.dataDelivBaseUrl",
+ "org.apache.oodt.cas.profile.dataDelivBaseUrl",
"http://localhost:8080/filemgr/data");
productTypeFilter = buildFilter(System
- .getProperty("gov.nasa.jpl.oodt.cas.profile.product.types"));
+ .getProperty("org.apache.oodt.cas.profile.product.types"));
}
/*
* (non-Javadoc)
*
- * @see jpl.eda.profile.handlers.ProfileHandler#findProfiles(jpl.eda.xmlquery.XMLQuery)
+ * @see org.apache.oodt.profile.handlers.ProfileHandler#findProfiles(org.apache.oodt.xmlquery.XMLQuery)
*/
public List findProfiles(XMLQuery query) throws ProfileException {
List profs = new Vector();
@@ -117,7 +117,7 @@ public class CASProfileHandler implement
/*
* (non-Javadoc)
*
- * @see jpl.eda.profile.handlers.ProfileHandler#get(java.lang.String)
+ * @see org.apache.oodt.profile.handlers.ProfileHandler#get(java.lang.String)
*/
public Profile get(String arg0) throws ProfileException {
throw new ProfileException("Method not implemented yet");
@@ -126,7 +126,7 @@ public class CASProfileHandler implement
/*
* (non-Javadoc)
*
- * @see jpl.eda.profile.handlers.ProfileHandler#getID()
+ * @see org.apache.oodt.profile.handlers.ProfileHandler#getID()
*/
public String getID() {
return "CAS Filemgr Profile Handler";
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/cas/util/ProfileUtils.java Fri Jul 16 02:44:04 2010
@@ -16,20 +16,20 @@
*/
-package gov.nasa.jpl.oodt.cas.profile.util;
+package org.apache.oodt.cas.profile.util;
//CAS imports
import java.util.Iterator;
import java.util.List;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.metadata.Metadata;
//OODT imports
-import jpl.eda.profile.EnumeratedProfileElement;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileAttributes;
-import jpl.eda.profile.ResourceAttributes;
+import org.apache.oodt.profile.EnumeratedProfileElement;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileAttributes;
+import org.apache.oodt.profile.ResourceAttributes;
/**
* @author mattmann
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Map;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/AndExpression.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.HashSet;
import java.util.Map;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/ConstantExpression.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Set;
import java.util.Collections;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/FalseResult.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java Fri Jul 16 02:44:04 2010
@@ -16,10 +16,10 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Set;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.ProfileElement;
/**
* Intersection of the two sets is the result.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Intersection.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -30,15 +30,15 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Stack;
-import jpl.eda.Configuration;
-import jpl.eda.ExecServerConfig;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileException;
-import jpl.eda.profile.handlers.ProfileHandler;
-import jpl.eda.util.DOMParser;
-import jpl.eda.util.XML;
-import jpl.eda.xmlquery.QueryElement;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.commons.Configuration;
+import org.apache.oodt.commons.ExecServerConfig;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileException;
+import org.apache.oodt.profile.handlers.ProfileHandler;
+import org.apache.oodt.commons.util.DOMParser;
+import org.apache.oodt.commons.util.XML;
+import org.apache.oodt.xmlquery.QueryElement;
+import org.apache.oodt.xmlquery.XMLQuery;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
@@ -80,10 +80,10 @@ final public class LightweightProfileSer
* @throws MalformedURLException If the URL to the profile file is malformed.
*/
public LightweightProfileServer(Properties props) throws IOException, SAXException, MalformedURLException {
- this(new URL(props.getProperty("jpl.eda.profile.handlers.LightweightProfileServer.profiles.url",
- props.getProperty("jpl.eda.profile.webServer.baseURL", "http://eda.jpl.nasa.gov")
+ this(new URL(props.getProperty("org.apache.oodt.profile.handlers.LightweightProfileServer.profiles.url",
+ props.getProperty("org.apache.oodt.profile.webServer.baseURL", "http://eda.jpl.nasa.gov")
+ "/profiles.xml")),
- props.getProperty("jpl.eda.profile.handlers.LightweightProfileServer.id", "lightweight"));
+ props.getProperty("org.apache.oodt.profile.handlers.LightweightProfileServer.id", "lightweight"));
}
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/LightweightProfileServer.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java Fri Jul 16 02:44:04 2010
@@ -16,11 +16,11 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Collections;
import java.util.Set;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.ProfileElement;
/**
* A matching result.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/MatchingResult.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Map;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/NotExpression.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Arrays;
import java.util.HashSet;
@@ -122,7 +122,7 @@ class OperatorExpression implements Wher
* "where" part. These work off the resource attributes rather than the profile
* elements.
*/
- private static final Set FROM_TOKENS = new HashSet(Arrays.asList(jpl.eda.xmlquery.XMLQuery.FROM_TOKENS));
+ private static final Set FROM_TOKENS = new HashSet(Arrays.asList(org.apache.oodt.xmlquery.XMLQuery.FROM_TOKENS));
/**
* Resource attributes that are parsed into WHERE part of the xmlquery
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OperatorExpression.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Map;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/OrExpression.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Set;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Result.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,11 +16,11 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.rmi.RemoteException;
-import jpl.eda.xmlquery.XMLQuery;
-import jpl.eda.profile.EnumeratedProfileElement;
+import org.apache.oodt.xmlquery.XMLQuery;
+import org.apache.oodt.profile.EnumeratedProfileElement;
import java.util.List;
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableEnumeratedProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java Fri Jul 16 02:44:04 2010
@@ -16,16 +16,16 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.List;
-import jpl.eda.profile.EnumeratedProfileElement;
-import jpl.eda.profile.ObjectFactory;
-import jpl.eda.profile.Profile;
-import jpl.eda.profile.ProfileAttributes;
-import jpl.eda.profile.RangedProfileElement;
-import jpl.eda.profile.ResourceAttributes;
-import jpl.eda.profile.UnspecifiedProfileElement;
+import org.apache.oodt.profile.EnumeratedProfileElement;
+import org.apache.oodt.profile.ObjectFactory;
+import org.apache.oodt.profile.Profile;
+import org.apache.oodt.profile.ProfileAttributes;
+import org.apache.oodt.profile.RangedProfileElement;
+import org.apache.oodt.profile.ResourceAttributes;
+import org.apache.oodt.profile.UnspecifiedProfileElement;
import org.w3c.dom.Element;
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableObjectFactory.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java Fri Jul 16 02:44:04 2010
@@ -16,10 +16,10 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
-import jpl.eda.profile.ObjectFactory;
-import jpl.eda.profile.Profile;
+import org.apache.oodt.profile.ObjectFactory;
+import org.apache.oodt.profile.Profile;
import org.w3c.dom.Element;
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfile.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.ProfileElement;
/**
* A profile element that can be searched.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,10 +16,10 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.List;
-import jpl.eda.profile.RangedProfileElement;
+import org.apache.oodt.profile.RangedProfileElement;
/**
* Searchable profile element with a range of valid values.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableRangedProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java Fri Jul 16 02:44:04 2010
@@ -16,12 +16,12 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import jpl.eda.profile.ResourceAttributes;
+import org.apache.oodt.profile.ResourceAttributes;
import org.w3c.dom.Element;
/**
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableResourceAttributes.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java Fri Jul 16 02:44:04 2010
@@ -16,10 +16,10 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.List;
-import jpl.eda.profile.UnspecifiedProfileElement;
+import org.apache.oodt.profile.UnspecifiedProfileElement;
/**
* Searchable profile element with unspecified values.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/SearchableUnspecifiedProfileElement.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java Fri Jul 16 02:44:04 2010
@@ -16,10 +16,10 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Set;
-import jpl.eda.profile.ProfileElement;
+import org.apache.oodt.profile.ProfileElement;
/**
* A union of matching elements.
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/Union.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java?rev=964658&r1=964657&r2=964658&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java (original)
+++ incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java Fri Jul 16 02:44:04 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.profile.handlers.lightweight;
+package org.apache.oodt.profile.handlers.lightweight;
import java.util.Map;
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/WhereExpression.java
('svn:executable' removed)
Propchange: incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/handlers/lightweight/package.html
('svn:executable' removed)
Re: svn commit: r964658 - in /incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile:
./ activity/ gui/ gui/pstructs/ handlers/ handlers/cas/ handlers/cas/util/
handlers/lightweight/ handlers/oracle/
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Sun, Jul 18, 2010 at 4:51 AM, Sean Kelly <ke...@apache.org> wrote:
>> Do you have more information on this "svn checksum" issue?
>
> I believe it was caused by local corruption of a `.svn` directory or two after some clumsy `sed` applications, and was limited to a few subdirectories.
Ah, so, you borked the pristine files in .svn. Score one for
checksums doing their job. =P
Looks like your strategy to "recover" was fine. Thanks for the info! -- justin
Re: svn commit: r964658 - in /incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile: ./ activity/ gui/ gui/pstructs/ handlers/ handlers/cas/ handlers/cas/util/ handlers/lightweight/ handlers/oracle/
Posted by Sean Kelly <ke...@apache.org>.
> Do you have more information on this "svn checksum" issue?
I believe it was caused by local corruption of a `.svn` directory or two after some clumsy `sed` applications, and was limited to a few subdirectories.
To recover, I:
1. Saved changes to source files elsewhere in the filesystem
2. `rm -r`'d the affected subdirectories
3. `svn update` to restore them
4. Copied over the changed source files
5. `svn ci` to commit the changes—successfully, this time.
--k
Re: svn commit: r964658 - in /incubator/oodt/trunk/profile/src/main/java/org/apache/oodt/profile:
./ activity/ gui/ gui/pstructs/ handlers/ handlers/cas/ handlers/cas/util/
handlers/lightweight/ handlers/oracle/
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Thu, Jul 15, 2010 at 7:44 PM, <ke...@apache.org> wrote:
> Author: kelly
> Date: Fri Jul 16 02:44:04 2010
> New Revision: 964658
>
> URL: http://svn.apache.org/viewvc?rev=964658&view=rev
> Log:
> Partial commit to work around svn checksum issue
Do you have more information on this "svn checksum" issue?
Thanks! -- justin