Author: lewismc
Date: Tue Sep 8 03:44:35 2015
New Revision: 1701720
URL: http://svn.apache.org/r1701720
Log:
OODT-872 Upgrade Jena dependencies to org.apache.jena 3.0.0
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/core/pom.xml
oodt/trunk/grid/pom.xml
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
oodt/trunk/profile/pom.xml
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Utility.java
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Sep 8 03:44:35 2015
@@ -2,6 +2,7 @@ Apache OODT Change Log
======================
Release 0.11 - Current Development
+* OODT-872 Upgrade Jena dependencies to org.apache.jena 3.0.0 (lewismc,
mattmann)
Release 0.10 - 08/30/2015
Modified: oodt/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/core/pom.xml?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/core/pom.xml (original)
+++ oodt/trunk/core/pom.xml Tue Sep 8 03:44:35 2015
@@ -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>
@@ -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/trunk/grid/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/grid/pom.xml?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/grid/pom.xml (original)
+++ oodt/trunk/grid/pom.xml Tue Sep 8 03:44:35 2015
@@ -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/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
(original)
+++
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/OpendapProfileElementExtractor.java
Tue Sep 8 03:44:35 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/trunk/profile/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/pom.xml?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/profile/pom.xml (original)
+++ oodt/trunk/profile/pom.xml Tue Sep 8 03:44:35 2015
@@ -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/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
(original)
+++
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/EnumeratedProfileElement.java
Tue Sep 8 03:44:35 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/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java
(original)
+++ oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Profile.java Tue
Sep 8 03:44:35 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,
Modified:
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
(original)
+++
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java
Tue Sep 8 03:44:35 2015
@@ -18,8 +18,9 @@
package org.apache.oodt.profile;
-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.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
@@ -27,6 +28,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import org.apache.oodt.commons.util.Documentable;
import org.apache.oodt.commons.util.XML;
import org.w3c.dom.DOMException;
@@ -42,7 +44,7 @@ import org.w3c.dom.NodeList;
*
* @author Kelly
*/
-public abstract class ProfileElement implements Serializable, Cloneable,
Comparable, Documentable {
+public abstract class ProfileElement implements Serializable, Cloneable,
Comparable<Object>, Documentable {
/**
* Create a profile element from the given XML node.
*
@@ -56,7 +58,7 @@ public abstract class ProfileElement imp
String desc = null;
String type = null;
String unit = null;
- List synonyms = new ArrayList();
+ List<String> synonyms = new ArrayList<String>();
boolean obligation = false;
int maxOccurrence = 0;
String comments = null;
@@ -65,7 +67,7 @@ public abstract class ProfileElement imp
String min = "0.0", max = "0.0";
boolean gotMin = false;
boolean gotMax = false;
- List values = new ArrayList();
+ List<String> values = new ArrayList<String>();
for (int i = 0; i < children.getLength(); ++i) {
Node node = children.item(i);
if ("elemId".equals(node.getNodeName()))
@@ -121,7 +123,7 @@ public abstract class ProfileElement imp
*/
protected ProfileElement(Profile profile) {
this.profile = profile;
- synonyms = new ArrayList();
+ synonyms = new ArrayList<Object>();
}
/**
@@ -138,7 +140,7 @@ public abstract class ProfileElement imp
* @param maxOccurrence Maximum number of occurrences of this element.
* @param comments Any comments about this element.
*/
- protected ProfileElement(Profile profile, String name, String id,
String desc, String type, String unit, List synonyms,
+ protected ProfileElement(Profile profile, String name, String id,
String desc, String type, String unit, List<?> synonyms,
boolean obligation, int maxOccurrence, String comments) {
this.profile = profile;
this.name = name;
@@ -496,7 +498,7 @@ public abstract class ProfileElement imp
protected String unit;
/** My synonyms. */
- protected List synonyms;
+ protected List<?> synonyms;
/** My obligation. */
protected boolean obligation;
@@ -522,9 +524,9 @@ public abstract class ProfileElement imp
* @param elements Profile elements.
* @return Profiles that own those elements.
*/
- public static Set profiles(Set elements) {
- Set rc = new HashSet();
- for (Iterator i = elements.iterator(); i.hasNext();) {
+ public static Set<Profile> profiles(Set<?> elements) {
+ Set<Profile> rc = new HashSet<Profile>();
+ for (Iterator<?> i = elements.iterator(); i.hasNext();) {
ProfileElement element = (ProfileElement) i.next();
rc.add(element.getProfile());
}
@@ -539,9 +541,9 @@ public abstract class ProfileElement imp
* @param elements Profile elements.
* @return Members of <var>elements</var> that are owned by members of
<var>profiles</var>.
*/
- public static Set elements(Set profiles, Set elements) {
- Set rc = new HashSet();
- for (Iterator i = elements.iterator(); i.hasNext();) {
+ public static Set<ProfileElement> elements(Set<?> profiles, Set<?>
elements) {
+ Set<ProfileElement> rc = new HashSet<ProfileElement>();
+ for (Iterator<?> i = elements.iterator(); i.hasNext();) {
ProfileElement element = (ProfileElement) i.next();
if (profiles.contains(element.getProfile()))
rc.add(element);
Modified:
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
(original)
+++
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java
Tue Sep 8 03:44:35 2015
@@ -24,8 +24,8 @@ 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;
/**
Modified:
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
(original)
+++
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java
Tue Sep 8 03:44:35 2015
@@ -18,15 +18,13 @@
package org.apache.oodt.profile;
-import com.hp.hpl.jena.rdf.model.Model;
-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.Resource;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-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;
@@ -34,8 +32,7 @@ import org.w3c.dom.Document;
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.net.URI;
/**
@@ -45,7 +42,7 @@ import java.net.URI;
*
* @author Kelly
*/
-public class ResourceAttributes implements Serializable, Cloneable,
Comparable, Documentable {
+public class ResourceAttributes implements Serializable, Cloneable,
Comparable<Object>, Documentable {
/**
* Create blank profile attributes.
*/
@@ -148,10 +145,10 @@ public class ResourceAttributes implemen
* @param clazz Class of the resource.
* @param locations Location of the resource.
*/
- public ResourceAttributes(Profile profile, String identifier, String
title, List formats, String description,
- List creators, List subjects, List publishers, List
contributors, List dates, List types, List sources,
- List languages, List relations, List coverages, List rights,
List contexts, String aggregation, String clazz,
- List locations) {
+ public ResourceAttributes(Profile profile, String identifier, String
title, List<String> formats, String description,
+ List<String> creators, List<String> subjects, List<String>
publishers, List<String> contributors, List<String> dates, List<String> types,
List<String> sources,
+ List<String> languages, List<String> relations, List<String>
coverages, List<String> rights, List<String> contexts, String aggregation,
String clazz,
+ List<String> locations) {
this.profile = profile;
this.identifier = identifier;
this.title = title;
@@ -285,7 +282,7 @@ public class ResourceAttributes implemen
*
* @return The formats.
*/
- public List getFormats() {
+ public List<String> getFormats() {
return formats;
}
@@ -312,7 +309,7 @@ public class ResourceAttributes implemen
*
* @return The creators.
*/
- public List getCreators() {
+ public List<String> getCreators() {
return creators;
}
@@ -321,7 +318,7 @@ public class ResourceAttributes implemen
*
* @return The subjects.
*/
- public List getSubjects() {
+ public List<String> getSubjects() {
return subjects;
}
@@ -330,7 +327,7 @@ public class ResourceAttributes implemen
*
* @return The publishers.
*/
- public List getPublishers() {
+ public List<String> getPublishers() {
return publishers;
}
@@ -339,7 +336,7 @@ public class ResourceAttributes implemen
*
* @return The contributors.
*/
- public List getContributors() {
+ public List<String> getContributors() {
return contributors;
}
@@ -348,7 +345,7 @@ public class ResourceAttributes implemen
*
* @return The dates.
*/
- public List getDates() {
+ public List<String> getDates() {
return dates;
}
@@ -357,7 +354,7 @@ public class ResourceAttributes implemen
*
* @return The types.
*/
- public List getTypes() {
+ public List<String> getTypes() {
return types;
}
@@ -366,7 +363,7 @@ public class ResourceAttributes implemen
*
* @return The sources.
*/
- public List getSources() {
+ public List<String> getSources() {
return sources;
}
@@ -375,7 +372,7 @@ public class ResourceAttributes implemen
*
* @return The languages.
*/
- public List getLanguages() {
+ public List<String> getLanguages() {
return languages;
}
@@ -384,7 +381,7 @@ public class ResourceAttributes implemen
*
* @return The relations.
*/
- public List getRelations() {
+ public List<String> getRelations() {
return relations;
}
@@ -393,7 +390,7 @@ public class ResourceAttributes implemen
*
* @return The coverages.
*/
- public List getCoverages() {
+ public List<String> getCoverages() {
return coverages;
}
@@ -402,7 +399,7 @@ public class ResourceAttributes implemen
*
* @return The rights.
*/
- public List getRights() {
+ public List<String> getRights() {
return rights;
}
@@ -411,7 +408,7 @@ public class ResourceAttributes implemen
*
* @return The contexts, a list of {@link String}s.
*/
- public List getResContexts() {
+ public List<String> getResContexts() {
return contexts;
}
@@ -457,7 +454,7 @@ public class ResourceAttributes implemen
*
* @return Locations, a list of {@link String}s.
*/
- public List getResLocations() {
+ public List<String> getResLocations() {
return locations;
}
@@ -466,20 +463,20 @@ public class ResourceAttributes implemen
* Initialize all the various {@link java.util.List} fields.
*/
protected void initializeLists() {
- formats = new ArrayList();
- creators = new ArrayList();
- subjects = new ArrayList();
- publishers = new ArrayList();
- contributors = new ArrayList();
- dates = new ArrayList();
- types = new ArrayList();
- sources = new ArrayList();
- languages = new ArrayList();
- relations = new ArrayList();
- coverages = new ArrayList();
- rights = new ArrayList();
- contexts = new ArrayList();
- locations = new ArrayList();
+ formats = new ArrayList<String>();
+ creators = new ArrayList<String>();
+ subjects = new ArrayList<String>();
+ publishers = new ArrayList<String>();
+ contributors = new ArrayList<String>();
+ dates = new ArrayList<String>();
+ types = new ArrayList<String>();
+ sources = new ArrayList<String>();
+ languages = new ArrayList<String>();
+ relations = new ArrayList<String>();
+ coverages = new ArrayList<String>();
+ rights = new ArrayList<String>();
+ contexts = new ArrayList<String>();
+ locations = new ArrayList<String>();
}
/** Profile I describe. */
@@ -492,46 +489,46 @@ public class ResourceAttributes implemen
protected String title;
/** Formats. */
- protected List formats;
+ protected List<String> formats;
/** Descriptions. */
protected String description;
/** Creators. */
- protected List creators;
+ protected List<String> creators;
/** Subjects. */
- protected List subjects;
+ protected List<String> subjects;
/** Publishers. */
- protected List publishers;
+ protected List<String> publishers;
/** Contributors. */
- protected List contributors;
+ protected List<String> contributors;
/** Dates. */
- protected List dates;
+ protected List<String> dates;
/** Types. */
- protected List types;
+ protected List<String> types;
/** Sources. */
- protected List sources;
+ protected List<String> sources;
/** Languages. */
- protected List languages;
+ protected List<String> languages;
/** Relations. */
- protected List relations;
+ protected List<String> relations;
/** Coverages. */
- protected List coverages;
+ protected List<String> coverages;
/** Rights. */
- protected List rights;
+ protected List<String> rights;
/** Contexts, one or more list of {@link String}s. */
- protected List contexts;
+ protected List<String> contexts;
/** Aggregation. */
protected String aggregation;
@@ -540,7 +537,7 @@ public class ResourceAttributes implemen
protected String clazz;
/** Locations, zero or more {@link String}s. */
- protected List locations;
+ protected List<String> locations;
/**
* Serialize this attributes as an XML node.
@@ -566,7 +563,7 @@ public class ResourceAttributes implemen
XML.add(root, "Relation", relations);
XML.add(root, "Coverage", coverages);
XML.add(root, "Rights", rights);
- List contexts = new ArrayList(this.contexts);
+ List<String> contexts = new ArrayList<String>(this.contexts);
if (contexts.isEmpty()) contexts.add("UNKNOWN");
XML.add(root, "resContext", contexts);
XML.addNonNull(root, "resAggregation", aggregation);
Modified:
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
(original)
+++
oodt/trunk/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java
Tue Sep 8 03:44:35 2015
@@ -22,8 +22,8 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
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;
/**
Modified: oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Utility.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Utility.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
--- oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Utility.java
(original)
+++ oodt/trunk/profile/src/main/java/org/apache/oodt/profile/Utility.java Tue
Sep 8 03:44:35 2015
@@ -16,17 +16,22 @@
package org.apache.oodt.profile;
import org.apache.oodt.commons.Configuration;
+
import java.io.IOException;
+
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Property;
+
import java.util.Iterator;
import java.util.Collection;
-import com.hp.hpl.jena.rdf.model.Bag;
-import com.hp.hpl.jena.rdf.model.Seq;
+
+import org.apache.jena.rdf.model.Bag;
+import org.apache.jena.rdf.model.Seq;
+
import java.util.List;
import java.net.URI;
@@ -52,10 +57,10 @@ class Utility {
Object obj;
if (value instanceof Collection) {
- Collection collection = (Collection) value;
+ Collection<?> collection = (Collection<?>) value;
if (collection.isEmpty()) return;
Bag bag = model.createBag(uri + "_" +
property.getLocalName() + "_bag");
- for (Iterator i = collection.iterator(); i.hasNext();)
+ for (Iterator<?> i = collection.iterator();
i.hasNext();)
bag.add(i.next());
resource.addProperty(property, bag);
obj = bag;
@@ -79,18 +84,18 @@ class Utility {
addPotentiallyNullReifiedStatement(reification, edmParent,
profAttr.getParent());
addPotentiallyNullReifiedStatement(reification, edmRegAuth,
profAttr.getRegAuthority());
- List children = profAttr.getChildren();
+ List<?> children = profAttr.getChildren();
if (!children.isEmpty()) {
Bag bag = model.createBag(uri + "_" +
property.getLocalName() + "_childrenBag");
- for (Iterator i = children.iterator(); i.hasNext();)
+ for (Iterator<?> i = children.iterator(); i.hasNext();)
bag.add(i.next());
reification.addProperty(edmChild, bag);
}
- List revNotes = profAttr.getRevisionNotes();
+ List<?> revNotes = profAttr.getRevisionNotes();
if (!revNotes.isEmpty()) {
Seq seq = model.createSeq(uri + "_" +
property.getLocalName() + "_revNotesSeq");
- for (Iterator i = revNotes.iterator(); i.hasNext();)
+ for (Iterator<?> i = revNotes.iterator(); i.hasNext();)
seq.add(i.next());
reification.addProperty(edmRevNote, seq);
}
@@ -169,7 +174,8 @@ class Utility {
*/
static {
try {
- Configuration config = Configuration.getConfiguration();
+ @SuppressWarnings("unused")
+ Configuration config = Configuration.getConfiguration();
String profNS = System.getProperty("jpl.rdf.ns",
"http://oodt.jpl.nasa.gov/grid-profile/rdfs/prof.rdf";);
Model model = ModelFactory.createDefaultModel();
Modified:
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java?rev=1701720&r1=1701719&r2=1701720&view=diff
==============================================================================
---
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
(original)
+++
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
Tue Sep 8 03:44:35 2015
@@ -120,6 +120,7 @@ public class DBMSExecutor {
}
+ @SuppressWarnings("unchecked")
private Profile toProfile(ResultSet rs, Mapping map, String resLocationSpec)
{
Profile profile = new Profile();
ResourceAttributes resAttr = profile.getResourceAttributes();
