Modified: oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java (original) +++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ProfileElement.java Fri Sep 25 12:55:12 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/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java (original) +++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/RangedProfileElement.java Fri Sep 25 12:55:12 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/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java (original) +++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/ResourceAttributes.java Fri Sep 25 12:55:12 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/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java (original) +++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/UnspecifiedProfileElement.java Fri Sep 25 12:55:12 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/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Utility.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Utility.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Utility.java (original) +++ oodt/branches/dependency-update/profile/src/main/java/org/apache/oodt/profile/Utility.java Fri Sep 25 12:55:12 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/branches/dependency-update/profile/src/test/resources/org/apache/oodt/profile/test.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/test/resources/org/apache/oodt/profile/test.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/test/resources/org/apache/oodt/profile/test.xml (original) +++ oodt/branches/dependency-update/profile/src/test/resources/org/apache/oodt/profile/test.xml Fri Sep 25 12:55:12 2015 @@ -1,6 +1,22 @@ <!-- DO NOT put the XML processing instruction or DOCTYPE decl in this --> <!-- file! They're added by the unit test automatically. --> <!-- $Id: test.xml,v 1.1.1.1 2004/03/02 20:53:39 kelly Exp $ --> +<!-- +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. +--> <profile> <profAttributes> <profId>OODT_PDS_PROFILE_SERVER</profId> Modified: oodt/branches/dependency-update/profile/src/test/resources/test.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/profile/src/test/resources/test.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/profile/src/test/resources/test.xml (original) +++ oodt/branches/dependency-update/profile/src/test/resources/test.xml Fri Sep 25 12:55:12 2015 @@ -1,6 +1,22 @@ <!-- DO NOT put the XML processing instruction or DOCTYPE decl in this --> <!-- file! They're added by the unit test automatically. --> <!-- $Id: test.xml,v 1.1.1.1 2004/03/02 20:53:39 kelly Exp $ --> +<!-- +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. +--> <profile> <profAttributes> <profId>OODT_PDS_PROFILE_SERVER</profId> Modified: oodt/branches/dependency-update/protocol/api/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/api/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/api/pom.xml (original) +++ oodt/branches/dependency-update/protocol/api/pom.xml Fri Sep 25 12:55:12 2015 @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-protocol-api</artifactId> Modified: oodt/branches/dependency-update/protocol/ftp/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/ftp/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/ftp/pom.xml (original) +++ oodt/branches/dependency-update/protocol/ftp/pom.xml Fri Sep 25 12:55:12 2015 @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-protocol-ftp</artifactId> Modified: oodt/branches/dependency-update/protocol/http/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/http/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/http/pom.xml (original) +++ oodt/branches/dependency-update/protocol/http/pom.xml Fri Sep 25 12:55:12 2015 @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-protocol-http</artifactId> Modified: oodt/branches/dependency-update/protocol/imaps/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/imaps/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/imaps/pom.xml (original) +++ oodt/branches/dependency-update/protocol/imaps/pom.xml Fri Sep 25 12:55:12 2015 @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-protocol-imaps</artifactId> Modified: oodt/branches/dependency-update/protocol/sftp/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/protocol/sftp/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/protocol/sftp/pom.xml (original) +++ oodt/branches/dependency-update/protocol/sftp/pom.xml Fri Sep 25 12:55:12 2015 @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-protocol-sftp</artifactId> Modified: oodt/branches/dependency-update/pushpull/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/pushpull/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/pushpull/pom.xml (original) +++ oodt/branches/dependency-update/pushpull/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>cas-pushpull</artifactId> Modified: oodt/branches/dependency-update/resource/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/pom.xml (original) +++ oodt/branches/dependency-update/resource/pom.xml Fri Sep 25 12:55:12 2015 @@ -20,7 +20,7 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>cas-resource</artifactId> Modified: oodt/branches/dependency-update/resource/src/main/bin/resmgr URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/bin/resmgr?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/bin/resmgr (original) +++ oodt/branches/dependency-update/resource/src/main/bin/resmgr Fri Sep 25 12:55:12 2015 @@ -59,6 +59,7 @@ case "$1" in stop) echo -n "Shutting down cas resource manager: " kill `cat ${RUN_HOME}/cas.resmgr.pid` + rm -f ${RUN_HOME}/cas.resmgr.pid echo "OK" ;; restart) Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/Batchmgr.java Fri Sep 25 12:55:12 2015 @@ -27,6 +27,7 @@ import org.apache.oodt.cas.resource.stru //java imports import java.net.URL; +import java.util.List; /** * @author woollard @@ -87,5 +88,11 @@ public interface Batchmgr { * @return */ public String getExecutionNode(String jobId); + + /** + * Get a list of the ids of all jobs that are executing on the given node. + * @return A list of ids of jobs on the given node + */ + public List getJobsOnNode(String nodeId); } Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/XmlRpcBatchMgr.java Fri Sep 25 12:55:12 2015 @@ -30,8 +30,12 @@ import org.apache.oodt.cas.resource.stru import org.apache.oodt.cas.resource.structs.exceptions.MonitorException; //JDK imports +import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; @@ -139,6 +143,23 @@ public class XmlRpcBatchMgr implements B XmlRpcBatchMgrProxy proxy = new XmlRpcBatchMgrProxy(spec, node, this); return proxy.killJob(); } + + public List getJobsOnNode(String nodeId){ + Vector<String> jobIds = new Vector(); + + if(this.nodeToJobMap.size() > 0){ + for(Iterator i = this.nodeToJobMap.keySet().iterator(); i.hasNext(); ){ + String jobId = (String)i.next(); + if(nodeId.equals(this.nodeToJobMap.get(jobId))){ + jobIds.add(jobId); + } + } + } + + Collections.sort(jobIds); // sort the list to return as a courtesy to the user + + return jobIds; + } protected void notifyMonitor(ResourceNode node, JobSpec jobSpec) { Job job = jobSpec.getJob(); Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxBatchManager.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxBatchManager.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxBatchManager.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/mux/QueueMuxBatchManager.java Fri Sep 25 12:55:12 2015 @@ -17,6 +17,7 @@ package org.apache.oodt.cas.resource.mux; +import java.util.List; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; @@ -26,6 +27,7 @@ import org.apache.oodt.cas.resource.batc import org.apache.oodt.cas.resource.jobrepo.JobRepository; import org.apache.oodt.cas.resource.monitor.Monitor; import org.apache.oodt.cas.resource.structs.JobSpec; +import org.apache.oodt.cas.resource.structs.Job; import org.apache.oodt.cas.resource.structs.ResourceNode; import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException; import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; @@ -84,6 +86,11 @@ public class QueueMuxBatchManager implem throw new UnsupportedOperationException("Cannot set the monitor when using the queue-mux batch manager."); } + @Override + public List<Job> getJobsOnNode(String nodeId) { + throw new UnsupportedOperationException("Method not supported: get Jobs on Node."); + } + /* (non-Javadoc) * @see org.apache.oodt.cas.resource.batchmgr.Batchmgr#setJobRepository(org.apache.oodt.cas.resource.jobrepo.JobRepository) */ Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java Fri Sep 25 12:55:12 2015 @@ -19,7 +19,7 @@ package org.apache.oodt.cas.resource.scheduler; //JDKimports -import java.lang.Integer; +import java.lang.Double; import java.util.logging.Level; import java.util.logging.Logger; @@ -63,7 +63,7 @@ public class LRUScheduler implements Sch private JobQueue myJobQueue; /* our wait time between checking the queue */ - private int waitTime = -1; + private double waitTime = -1; public LRUScheduler(Monitor m, Batchmgr b, JobQueue q, LRUQueueManager qm) { @@ -74,7 +74,7 @@ public class LRUScheduler implements Sch String waitStr = System.getProperty( "org.apache.oodt.cas.resource.scheduler.wait.seconds", "20"); - waitTime = Integer.parseInt(waitStr); + waitTime = Double.parseDouble(waitStr); } /* @@ -86,7 +86,8 @@ public class LRUScheduler implements Sch for (;;) { try { - Thread.currentThread().sleep((long) waitTime * 1000); + long sleepTime = (long)(waitTime * 1000.0); + Thread.currentThread().sleep(sleepTime); } catch (Exception ignore) {} if (!myJobQueue.isEmpty()) { Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java Fri Sep 25 12:55:12 2015 @@ -31,6 +31,7 @@ import org.apache.oodt.cas.resource.stru import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException; import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory; +import org.apache.oodt.cas.resource.util.ResourceNodeComparator; import org.apache.oodt.cas.resource.util.XmlRpcStructFactory; //APACHE imports @@ -41,8 +42,10 @@ import java.io.File; import java.io.FileInputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.Collections; import java.util.Date; import java.util.Hashtable; +import java.util.Iterator; import java.util.List; import java.util.Vector; import java.util.logging.Level; @@ -338,6 +341,93 @@ public class XmlRpcResourceManager { return load + "/" + capacity; } + public List getQueuedJobs() throws JobQueueException{ + Vector jobs = new Vector(); + List jobSpecs = this.scheduler.getJobQueue().getQueuedJobs(); + + if(jobSpecs != null && jobSpecs.size() > 0){ + for(Iterator i = jobSpecs.iterator(); i.hasNext();){ + Job job = ((JobSpec)i.next()).getJob(); + jobs.add(job); + } + } + + return XmlRpcStructFactory.getXmlRpcJobList(jobs); + } + + public String getNodeReport() throws MonitorException{ + String report = new String(); + + try{ + + // get a sorted list of nodes + List nodes = scheduler.getMonitor().getNodes(); + Collections.sort(nodes, new ResourceNodeComparator()); + + // formulate the report string + for(Iterator i = nodes.iterator(); i.hasNext(); ){ + ResourceNode node = (ResourceNode)i.next(); + String nodeId = node.getNodeId(); + report += nodeId; + report += " (" + getNodeLoad(nodeId) + "/" + node.getCapacity() + ")"; + List<String> nodeQueues = getQueuesWithNode(nodeId); + if(nodeQueues != null && nodeQueues.size() > 0){ + report += " -- " + nodeQueues.get(0); + for(int j = 1; j < nodeQueues.size(); j++){ + report += ", " + nodeQueues.get(j); + } + } + report += "\n"; + } + + }catch(Exception e){ + throw new MonitorException(e.getMessage(), e); + } + + return report; + } + + public String getExecutionReport() throws JobRepositoryException{ + String report = new String(); + + try{ + + // get a sorted list of all nodes, since the report should be + // alphabetically sorted by node + List resNodes = scheduler.getMonitor().getNodes(); + if(resNodes.size() == 0){ + throw new MonitorException( + "No jobs can be executing, as there are no nodes in the Monitor"); + } + Vector<String> nodeIds = new Vector<String>(); + for(Iterator i = resNodes.iterator(); i.hasNext(); ){ + nodeIds.add(((ResourceNode)i.next()).getNodeId()); + } + Collections.sort(nodeIds); + + // generate the report string + for(String nodeId: nodeIds){ + List execJobIds = this.scheduler.getBatchmgr().getJobsOnNode(nodeId); + if(execJobIds != null && execJobIds.size() > 0){ + for(Iterator i = execJobIds.iterator(); i.hasNext(); ){ + String jobId = (String)i.next(); + Job job = scheduler.getJobQueue().getJobRepository() + .getJobById(jobId).getJob(); + report += "job id=" + jobId; + report += ", load=" + job.getLoadValue(); + report += ", node=" + nodeId; + report += ", queue=" + job.getQueueName() + "\n"; + } + } + } + + }catch(Exception e){ + throw new JobRepositoryException(e.getMessage(), e); + } + + return report; + } + public static void main(String[] args) throws Exception { int portNum = -1; String usage = "XmlRpcResourceManager --portNum <port number for xml rpc service>\n"; Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java Fri Sep 25 12:55:12 2015 @@ -27,9 +27,11 @@ import org.apache.xmlrpc.XmlRpcException import org.apache.oodt.cas.cli.CmdLineUtility; import org.apache.oodt.cas.resource.structs.Job; import org.apache.oodt.cas.resource.structs.JobInput; +import org.apache.oodt.cas.resource.structs.JobSpec; import org.apache.oodt.cas.resource.structs.JobStatus; import org.apache.oodt.cas.resource.structs.ResourceNode; import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException; +import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException; import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException; import org.apache.oodt.cas.resource.structs.exceptions.MonitorException; import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; @@ -486,7 +488,44 @@ public class XmlRpcResourceManagerClient } } - private static String getReadableJobStatus(String status) { + public List getQueuedJobs() throws JobQueueException{ + Vector queuedJobs = null; + + try{ + queuedJobs = (Vector)client.execute("resourcemgr.getQueuedJobs", new Vector<Object>()); + }catch(Exception e){ + throw new JobQueueException(e.getMessage(), e); + } + + return XmlRpcStructFactory.getJobListFromXmlRpc(queuedJobs); + } + + public String getNodeReport() throws MonitorException{ + String report = null; + + try{ + report = (String)client.execute("resourcemgr.getNodeReport", new Vector<Object>()); + }catch(Exception e){ + throw new MonitorException(e.getMessage(), e); + } + + return report; + } + + + public String getExecReport() throws JobRepositoryException{ + String report = null; + + try{ + report = (String)client.execute("resourcemgr.getExecutionReport", new Vector<Object>()); + }catch(Exception e){ + throw new JobRepositoryException(e.getMessage(), e); + } + + return report; + } + + public static String getReadableJobStatus(String status) { if (status.equals(JobStatus.SUCCESS)) { return "SUCCESS"; } else if (status.equals(JobStatus.FAILURE)) { @@ -499,7 +538,7 @@ public class XmlRpcResourceManagerClient return "SCHEDULED"; } else if (status.equals(JobStatus.KILLED)) { return "KILLED"; - } else - return null; + } + else return null; } } Modified: oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java (original) +++ oodt/branches/dependency-update/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java Fri Sep 25 12:55:12 2015 @@ -68,6 +68,32 @@ public final class XmlRpcStructFactory { job.setStatus((String)jobHash.get("job.status")); return job; } + + public static Vector getXmlRpcJobList(List jobs){ + Vector jobVector = new Vector(); + + if(jobs != null && jobs.size() > 0){ + for(Iterator i = jobs.iterator(); i.hasNext();){ + Job job = (Job)i.next(); + jobVector.add(getXmlRpcJob(job)); + } + } + + return jobVector; + } + + public static List getJobListFromXmlRpc(Vector jobVector){ + List jobs = new Vector(); + + if(jobVector != null && jobVector.size() > 0){ + for(Iterator i = jobVector.iterator(); i.hasNext(); ){ + Hashtable jobHash = (Hashtable)i.next(); + jobs.add(getJobFromXmlRpc(jobHash)); + } + } + + return jobs; + } public static Vector getXmlRpcResourceNodeList(List resNodes) { Vector resNodeVector = new Vector(); Modified: oodt/branches/dependency-update/resource/src/main/resources/cmd-line-actions.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/resources/cmd-line-actions.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/resources/cmd-line-actions.xml (original) +++ oodt/branches/dependency-update/resource/src/main/resources/cmd-line-actions.xml Fri Sep 25 12:55:12 2015 @@ -62,6 +62,18 @@ class="org.apache.oodt.cas.resource.cli.action.GetQueuesCliAction"> <property name="description" value="Gets list of queues" /> </bean> + <bean id="getQueuedJobs" + class="org.apache.oodt.cas.resource.cli.action.GetQueuedJobsCliAction"> + <property name="description" value="Gets list of jobs currently in the queue" /> + </bean> + <bean id="getExecReport" + class="org.apache.oodt.cas.resource.cli.action.GetExecReportCliAction"> + <property name="description" value="Gets list of jobs currently in the queue" /> + </bean> + <bean id="getNodeReport" + class="org.apache.oodt.cas.resource.cli.action.GetNodeReportCliAction"> + <property name="description" value="Gets name (all nodes will be displayed in alphabetical order), load and capacity of all nodes, and their queues." /> + </bean> <bean id="getQueuesWithNode" class="org.apache.oodt.cas.resource.cli.action.GetQueuesWithNodeCliAction"> <property name="description" value="Gets list of queues which contain given node" /> Modified: oodt/branches/dependency-update/resource/src/main/resources/cmd-line-options.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/main/resources/cmd-line-options.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/main/resources/cmd-line-options.xml (original) +++ oodt/branches/dependency-update/resource/src/main/resources/cmd-line-options.xml Fri Sep 25 12:55:12 2015 @@ -55,14 +55,20 @@ p:option-ref="getNodes" p:required="false" /> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" p:option-ref="getQueues" p:required="false" /> + <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" + p:option-ref="getQueuedJobs" p:required="false" /> + <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" + p:option-ref="getNodeReport" p:required="false"/> + <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" + p:option-ref="getExecReport" p:required="false"/> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" p:option-ref="addNode" p:required="false" /> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" p:option-ref="removeNode" p:required="false" /> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" p:option-ref="setNodeCapacity" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getExecNode" p:required="false" /> + <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" + p:option-ref="getExecNode" p:required="false" /> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" p:option-ref="addQueue" p:required="false" /> <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" @@ -598,4 +604,60 @@ <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" /> </property> </bean> + + <bean id="getQueuedJobs" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" + p:isSubOption="true"> + <property name="shortOption" value="qjobs" /> + <property name="longOption" value="getQueuedJobs" /> + <property name="description" value="Triggers getQueuedJobs Action" /> + <property name="hasArgs" value="false" /> + <property name="staticArgs"> + <list> + <value>getQueuedJobs</value> + </list> + </property> + <property name="requirementRules"> + <list> + <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" + p:actionName="getQueuedJobs" p:relation="REQUIRED" /> + </list> + </property> + </bean> + + <bean id="getNodeReport" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" + p:isSubOption="true"> + <property name="shortOption" value="nreport" /> + <property name="longOption" value="getNodeReport" /> + <property name="description" value="Triggers getNodeReport Action" /> + <property name="hasArgs" value="false" /> + <property name="staticArgs"> + <list> + <value>getNodeReport</value> + </list> + </property> + <property name="requirementRules"> + <list> + <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" + p:actionName="getNodeReport" p:relation="REQUIRED" /> + </list> + </property> + </bean> + <bean id="getExecReport" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" + p:isSubOption="true"> + <property name="shortOption" value="ereport" /> + <property name="longOption" value="getExecReport" /> + <property name="description" value="Triggers getExecReport Action" /> + <property name="hasArgs" value="false" /> + <property name="staticArgs"> + <list> + <value>getExecReport</value> + </list> + </property> + <property name="requirementRules"> + <list> + <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" + p:actionName="getExecReport" p:relation="REQUIRED" /> + </list> + </property> + </bean> </beans> Modified: oodt/branches/dependency-update/resource/src/test/java/org/apache/oodt/cas/resource/mux/mocks/MockBatchManager.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/resource/src/test/java/org/apache/oodt/cas/resource/mux/mocks/MockBatchManager.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/resource/src/test/java/org/apache/oodt/cas/resource/mux/mocks/MockBatchManager.java (original) +++ oodt/branches/dependency-update/resource/src/test/java/org/apache/oodt/cas/resource/mux/mocks/MockBatchManager.java Fri Sep 25 12:55:12 2015 @@ -16,10 +16,12 @@ */ package org.apache.oodt.cas.resource.mux.mocks; +import java.util.List; import org.apache.oodt.cas.resource.batchmgr.Batchmgr; import org.apache.oodt.cas.resource.jobrepo.JobRepository; import org.apache.oodt.cas.resource.monitor.Monitor; import org.apache.oodt.cas.resource.structs.JobSpec; +import org.apache.oodt.cas.resource.structs.Job; import org.apache.oodt.cas.resource.structs.ResourceNode; import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException; /** @@ -48,6 +50,11 @@ public class MockBatchManager implements public void setJobRepository(JobRepository repository) {} @Override + public List<Job> getJobsOnNode(String nodeId){ + throw new UnsupportedOperationException("method not implemented. getJobsOnNode"); + } + + @Override public boolean killJob(String jobId, ResourceNode node) { if (this.execJobSpec.getJob().getId().equals(jobId)) { @@ -62,6 +69,7 @@ public class MockBatchManager implements public String getExecutionNode(String jobId) { return execResNode.getNodeId(); } + /***** * The following are test methods to report what jobs are here. *****/ Modified: oodt/branches/dependency-update/sso/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/sso/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/sso/pom.xml (original) +++ oodt/branches/dependency-update/sso/pom.xml Fri Sep 25 12:55:12 2015 @@ -20,7 +20,7 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>oodt-sso</artifactId> Modified: oodt/branches/dependency-update/webapp/components/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/components/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/components/pom.xml (original) +++ oodt/branches/dependency-update/webapp/components/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,13 +21,11 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> <artifactId>oodt-webapp-components</artifactId> <packaging>jar</packaging> - <version>0.10-SNAPSHOT</version> <name>OODT Wicket Web Components</name> <dependencies> <dependency> @@ -38,12 +36,12 @@ the License. <dependency> <groupId>org.apache.oodt</groupId> <artifactId>cas-filemgr</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.oodt</groupId> <artifactId>cas-workflow</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.oodt</groupId> @@ -72,6 +70,11 @@ the License. <version>4.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>0.9.9-RC1</version> + </dependency> </dependencies> <profiles> <profile> @@ -97,6 +100,16 @@ the License. <excludes> <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/prototype.js</exclude> <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/progress.js</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/jquery*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/demo/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/lib/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/*</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/MIT-License.txt</exclude> + <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/media/Bach-SuiteNo2.mp3</exclude> </excludes> </configuration> </plugin> Modified: oodt/branches/dependency-update/webapp/fmbrowser/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/fmbrowser/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/fmbrowser/pom.xml (original) +++ oodt/branches/dependency-update/webapp/fmbrowser/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,13 +21,13 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <groupId>org.apache.oodt</groupId> <artifactId>fmbrowser</artifactId> <packaging>war</packaging> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <name>CAS File Manager Browser Web App</name> <properties> <wicket.version>1.4.17</wicket.version> @@ -49,7 +49,7 @@ the License. <dependency> <groupId>org.apache.oodt</groupId> <artifactId>oodt-webapp-components</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> </dependency> <!-- LOGGING DEPENDENCIES - LOG4J --> Modified: oodt/branches/dependency-update/webapp/fmprod/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/fmprod/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/fmprod/pom.xml (original) +++ oodt/branches/dependency-update/webapp/fmprod/pom.xml Fri Sep 25 12:55:12 2015 @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <artifactId>cas-product</artifactId> Modified: oodt/branches/dependency-update/webapp/wmonitor/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/webapp/wmonitor/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/webapp/wmonitor/pom.xml (original) +++ oodt/branches/dependency-update/webapp/wmonitor/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,13 +21,13 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> <groupId>org.apache.oodt</groupId> <artifactId>wmonitor</artifactId> <packaging>war</packaging> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <name>CAS Workflow Manager Monitor Web App</name> <properties> <wicket.version>1.4.17</wicket.version> @@ -49,7 +49,7 @@ the License. <dependency> <groupId>org.apache.oodt</groupId> <artifactId>oodt-webapp-components</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <exclusions> <exclusion> <artifactId>cas-filemgr</artifactId> Modified: oodt/branches/dependency-update/workflow/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/workflow/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/workflow/pom.xml (original) +++ oodt/branches/dependency-update/workflow/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,7 +21,7 @@ the License. <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>cas-workflow</artifactId> Modified: oodt/branches/dependency-update/workflow/src/main/bin/wmgr URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/workflow/src/main/bin/wmgr?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/workflow/src/main/bin/wmgr (original) +++ oodt/branches/dependency-update/workflow/src/main/bin/wmgr Fri Sep 25 12:55:12 2015 @@ -61,6 +61,7 @@ case "$1" in stop) echo -n "Shutting down cas workflow manager: " kill `cat ${RUN_HOME}/cas.workflow.pid` + rm -f ${RUN_HOME}/cas.workflow.pid echo "OK" ;; restart) Modified: oodt/branches/dependency-update/xmlps/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlps/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/xmlps/pom.xml (original) +++ oodt/branches/dependency-update/xmlps/pom.xml Fri Sep 25 12:55:12 2015 @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>oodt-xmlps</artifactId> <name>XML-configured, DBMS-based Product and Profile Server</name> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <description> An XML-configured DBMS-based Product and Profile meant to easily sit on top of Web-Grid and other Product and Profile server contexts Modified: oodt/branches/dependency-update/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java (original) +++ oodt/branches/dependency-update/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java Fri Sep 25 12:55:12 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(); Modified: oodt/branches/dependency-update/xmlquery/pom.xml URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlquery/pom.xml?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/xmlquery/pom.xml (original) +++ oodt/branches/dependency-update/xmlquery/pom.xml Fri Sep 25 12:55:12 2015 @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> - <version>0.10-SNAPSHOT</version> + <version>0.11-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>oodt-xmlquery</artifactId> Modified: oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java URL: http://svn.apache.org/viewvc/oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java?rev=1705287&r1=1705286&r2=1705287&view=diff ============================================================================== --- oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java (original) +++ oodt/branches/dependency-update/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java Fri Sep 25 12:55:12 2015 @@ -404,6 +404,7 @@ public class XMLQuery implements java.io tokens = new java.io.StreamTokenizer(new StringReader(kwdQueryString)); tokens.resetSyntax(); tokens.ordinaryChar('/'); + tokens.wordChars('#', '#'); tokens.wordChars(':', ':'); tokens.wordChars('0', '9'); tokens.wordChars('.', '.');
