Return-Path: Delivered-To: apmail-incubator-oodt-commits-archive@minotaur.apache.org Received: (qmail 76193 invoked from network); 15 Apr 2010 23:02:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Apr 2010 23:02:25 -0000 Received: (qmail 23118 invoked by uid 500); 15 Apr 2010 23:02:25 -0000 Delivered-To: apmail-incubator-oodt-commits-archive@incubator.apache.org Received: (qmail 23096 invoked by uid 500); 15 Apr 2010 23:02:25 -0000 Mailing-List: contact oodt-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oodt-dev@incubator.apache.org Delivered-To: mailing list oodt-commits@incubator.apache.org Received: (qmail 23087 invoked by uid 99); 15 Apr 2010 23:02:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 23:02:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 23:02:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A335C2388BFF; Thu, 15 Apr 2010 23:01:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r934637 [10/12] - in /incubator/oodt/cas-metadata: branches/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/ branches/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/ branches/1_6_1_release/src/main/java/gov... Date: Thu, 15 Apr 2010 23:01:17 -0000 To: oodt-commits@incubator.apache.org From: smcclees@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100415230122.A335C2388BFF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestMetReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestMetReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestMetReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/extractors/TestMetReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/util/TestPathUtils.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/util/TestPathUtils.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/util/TestPathUtils.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_0_release/src/test/gov/nasa/jpl/oodt/cas/metadata/util/TestPathUtils.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.util; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/AbstractMetExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/AbstractMetExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/AbstractMetExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/AbstractMetExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2007, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2006, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfig.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfig.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfig.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfig.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfigReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfigReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfigReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/MetExtractorConfigReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/Metadata.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/Metadata.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/Metadata.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/Metadata.java Thu Apr 15 23:01:09 2010 @@ -1,466 +1,479 @@ -//Copyright (c) 2005, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ - -package gov.nasa.jpl.oodt.cas.metadata; - -//JDK imports -import java.util.Iterator; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.Hashtable; -import java.util.Vector; -import java.util.Map; -import java.util.List; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.net.URLEncoder; -import java.io.UnsupportedEncodingException; -import java.io.InputStream; - -//OODT imports -import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils; - -/** - * @author mattmann - * @version $Revision$ - * - *

- * Metadata is a {@link Map} of String keys mapped to - * Vector values. So, each key can map to potentially many - * values, but also can map to null, or to a single value. - *

- * - */ -public class Metadata { - - /* the map of elementName=>Elements */ - protected Map elementMap = null; - - /* our log stream */ - protected static final Logger LOG = Logger.getLogger(Metadata.class - .getName()); - - /** - *

- * Constructs a new Metadata - *

- */ - public Metadata() { - elementMap = new Hashtable(); - } - - /** - * @deprecated - *

- * Constructs a new Metadata from a given InputStream. - * - * @param is - * The InputStream to read. - */ - public Metadata(InputStream is) throws Exception { - if (is == null) { - throw new Exception( - "Unable to parse metadata stream: stream not set!"); - } - - try { - DocumentBuilderFactory factory = DocumentBuilderFactory - .newInstance(); - factory.setNamespaceAware(true); - DocumentBuilder parser = factory.newDocumentBuilder(); - elementMap = new Hashtable(); - parse(parser.parse(new InputSource(is))); - } catch (Exception e) { - throw new Exception("Unable to parse metadata stream.", e); - } - } - - /** - *

- * Merges the existing Hashtable of metadata with the specified new - * Hashtable of metadata. - *

- * - * @param metadata - * The metadata to merge the internal metadata with. - */ - public void addMetadata(Hashtable metadata) { - addMetadata(metadata, false); - } - - /** - *

- * Merges the existing Hashtable of metadata with the specified new - * Hashtable of metadata, replacing an existing metadata value if a new - * metadata value with same key is specified, if the replace parameter is - * set to true. - * - * Otherwise, this function behaves the same as - * {@link #addMetadata(Hashtable)}. - *

- * - * @param metadata - * The metadata to merge the internal metadata with. - * @param replace - * If set to true, then an existing metadata value is replaced if - * a new metadata value with the same key is specified. - * Otherwise, if set to false then this function behaves as - * {@link #addMetadata(Hashtable)}. - * @since OODT-143 - */ - public void addMetadata(Hashtable metadata, boolean replace) { - // iterate through the keys and add values whereever possible, otherwise - // replace them - for (Iterator i = metadata.keySet().iterator(); i.hasNext();) { - String key = (String) i.next(); - List values = null; - - if (elementMap.get(key) != null) { - values = (List) elementMap.get(key); - if (replace) { - values.clear(); - } - } else { - values = new Vector(); - elementMap.put(key, values); - } - - if (metadata.get(key) != null) { - Object val = metadata.get(key); - - if (val instanceof List) { - values.addAll((List) val); - } else if (val instanceof String) { - values.add((String) val); - } - } - } - } - - /** - *

- * Replaces the internal hashtable of metadata with the specified - * {@link Hashtable}. - *

- * - * @param metadata - * The metadata to replace the existing internal {@Hashtable} - * with. - */ - public void replaceMetadata(Hashtable metadata) { - elementMap = new Hashtable(); - for (Iterator i = metadata.keySet().iterator(); i.hasNext();) { - String key = (String) i.next(); - Object val = metadata.get(key); - - List values = new Vector(); - if (val instanceof String) { - values.add((String) val); - } else if (val instanceof List) { - values.addAll((List) val); - } - - elementMap.put(key, values); - } - } - - /** - *

- * Adds a single String value to this metadata key. If the key already - * exists, this value is appended to that list of metadata values. If the - * key doesn't exist yet, a new list of metadata values is created and then - * this value is inserted first, in order. - *

- * - * @param key - * The key to add the value for. - * @param value - * The value to add. - */ - public void addMetadata(String key, String value) { - if (elementMap.get(key) != null) { - // append this value to the existing key - List values = (List) elementMap.get(key); - values.add(value); - } else { - List values = new Vector(); - values.add(value); - elementMap.put(key, values); - } - } - - /** - *

- * Adds a list of values to this metadata key. If the key already exists - * then the list of values is appended to the existing list of values for - * the key, in order. If the key doesn't exist, the list of String values - * are set as the value list for this key. - *

- * - * @param key - * The key to set the values for. - * @param values - * The ordered list of values for this String key. Values must be - * basic Strings. - */ - public void addMetadata(String key, List values) { - if (elementMap.get(key) != null) { - // get the existing values - List existingValues = (List) elementMap.get(key); - existingValues.addAll(values); - } else { - elementMap.put(key, values); - } - } - - /** - *

- * Removes the existing value list for the specified key, - * and replaces it with the specified {@link List} of values. - *

- * - * @param key - * The key to replace the metadata for. - * @param values - * The new metadata values for this key. - */ - public void replaceMetadata(String key, List values) { - Object value = removeMetadata(key); - value = null; - elementMap.put(key, values); - } - - /** - *

- * Removes the existing value list for the specified key, - * and replaces it with the specified String value. - *

- * - * @param key - * The key to replace the metadata for. - * @param value - * The new metadata value for this key. - */ - public void replaceMetadata(String key, String value) { - Object val = removeMetadata(key); - val = null; - List values = new Vector(); - values.add(value); - elementMap.put(key, values); - } - - /** - *

- * Removes the value of the specified metadata key. - *

- * - * @param key - * The key to remove the value from. - * @return The removed value. - */ - public Object removeMetadata(String key) { - return elementMap.remove(key); - } - - /** - *

- * Gets all metadata String values mapped to the specified key. - *

- * - * @param key - * The key to obtain multi-valued metadata for. - * @return all metadata String values mapped to the specified - * key. - */ - public List getAllMetadata(String key) { - if (elementMap.get(key) != null) { - return (List) elementMap.get(key); - } else - return null; - } - - /** - *

- * Gets a single String value mapped to the specified - * key. - *

- * - * @param key - * The key to obtain the single valued metadata for. - * @return A single String value mapped to the specified - * key. - */ - public String getMetadata(String key) { - if (elementMap.get(key) != null) { - List values = (List) elementMap.get(key); - if (values.size() == 0) { - return null; - } else { - return (String) values.get(0); - } - } else - return null; - } - - /** - * - * @return The internal {@link Hashtable} representation of the metadata. - */ - public Hashtable getHashtable() { - return (Hashtable) elementMap; - } - - /** - *

- * Test for existence of the specified key in the metadata element map. - *

- * - * @param key - * The key to check for existance of. - * @return True if the key exists in the Metadata, false otherwise. - */ - public boolean containsKey(String key) { - return elementMap.containsKey(key); - } - - /** - *

- * Checks to see whether or not a particular key is a multi-valued key - * field. - *

- * - * @param key - * The key to perform the multi-valued check on. - * @return True if the key is multi-valued, False, otherwise. - */ - public boolean isMultiValued(String key) { - if (elementMap.get(key) != null) { - List values = (List) elementMap.get(key); - - if (values != null) { - return values.size() > 1; - } else - return false; - } else - return false; - } - - public boolean equals(Object obj) { - if (obj instanceof Metadata) { - return ((Metadata) obj).elementMap.size() == this.elementMap.size() - && ((Metadata) obj).elementMap.entrySet().containsAll(this.elementMap.entrySet()); - }else - return false; - } - - /** - * @deprecated - *

- * @see gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata for new toXML usage. - * Returns an XML representation of this Metadata as an - * org.w3c.Document. - *

- * - * @return an XML representation of this Metadata as an - * org.w3c.Document. - * @throws Exception - * If any error occurs. - */ - public Document toXML() throws Exception { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setNamespaceAware(true); - Document document = null; - - try { - DocumentBuilder builder = factory.newDocumentBuilder(); - document = builder.newDocument(); - - Element root = (Element) document.createElement("cas:metadata"); - root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas"); - document.appendChild(root); - - // now add the set of metadata elements in the properties object - for (Iterator i = elementMap.keySet().iterator(); i.hasNext();) { - String elemName = null; - - try { - elemName = (String) i.next(); - List elemValues = (List) elementMap.get(elemName); - - Element metadataElem = document.createElement("keyval"); - Element keyElem = document.createElement("key"); - keyElem.appendChild(document.createTextNode(URLEncoder - .encode(elemName, "UTF-8"))); - - metadataElem.appendChild(keyElem); - - String type = "scalar"; - - if (elemValues.size() > 1) { - type = "vector"; - } - - metadataElem.setAttribute("type", type); - - for (Iterator j = elemValues.iterator(); j.hasNext();) { - String elemValue = (String) j.next(); - Element valElem = document.createElement("val"); - if (elemValue == null) { - throw new Exception("Attempt to write null value " - + "for property: [" + elemName - + "]: val: [" + elemValue + "]"); - } - valElem.appendChild(document.createTextNode(URLEncoder - .encode(elemValue, "UTF-8"))); - metadataElem.appendChild(valElem); - } - root.appendChild(metadataElem); - } catch (UnsupportedEncodingException e) { - LOG.log(Level.WARNING, "Error encoding metadata " - + elementMap + " to xml file!"); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - - } - - } catch (ParserConfigurationException pce) { - LOG.log(Level.WARNING, "Error generating metadata xml file!: " - + pce.getMessage()); - throw new Exception("Error generating metadata xml file!: " - + pce.getMessage()); - } - - return document; - } - - /** - * @deprecated - * @param document - * @throws Exception - */ - private void parse(Document document) throws Exception { - - Element root = document.getDocumentElement(); - - NodeList keyValElems = root.getElementsByTagName("keyval"); - - for (int i = 0; i < keyValElems.getLength(); i++) { - Element keyValElem = (Element) keyValElems.item(i); - - String elemName = XMLUtils.read(keyValElem, "key"); - List elemValues = XMLUtils.readMany(keyValElem, "val"); - elementMap.put(elemName, elemValues); - } - - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package gov.nasa.jpl.oodt.cas.metadata; + +//JDK imports +import java.util.Iterator; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.Hashtable; +import java.util.Vector; +import java.util.Map; +import java.util.List; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.net.URLEncoder; +import java.io.UnsupportedEncodingException; +import java.io.InputStream; + +//OODT imports +import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils; + +/** + * @author mattmann + * @version $Revision$ + * + *

+ * Metadata is a {@link Map} of String keys mapped to + * Vector values. So, each key can map to potentially many + * values, but also can map to null, or to a single value. + *

+ * + */ +public class Metadata { + + /* the map of elementName=>Elements */ + protected Map elementMap = null; + + /* our log stream */ + protected static final Logger LOG = Logger.getLogger(Metadata.class + .getName()); + + /** + *

+ * Constructs a new Metadata + *

+ */ + public Metadata() { + elementMap = new Hashtable(); + } + + /** + * @deprecated + *

+ * Constructs a new Metadata from a given InputStream. + * + * @param is + * The InputStream to read. + */ + public Metadata(InputStream is) throws Exception { + if (is == null) { + throw new Exception( + "Unable to parse metadata stream: stream not set!"); + } + + try { + DocumentBuilderFactory factory = DocumentBuilderFactory + .newInstance(); + factory.setNamespaceAware(true); + DocumentBuilder parser = factory.newDocumentBuilder(); + elementMap = new Hashtable(); + parse(parser.parse(new InputSource(is))); + } catch (Exception e) { + throw new Exception("Unable to parse metadata stream.", e); + } + } + + /** + *

+ * Merges the existing Hashtable of metadata with the specified new + * Hashtable of metadata. + *

+ * + * @param metadata + * The metadata to merge the internal metadata with. + */ + public void addMetadata(Hashtable metadata) { + addMetadata(metadata, false); + } + + /** + *

+ * Merges the existing Hashtable of metadata with the specified new + * Hashtable of metadata, replacing an existing metadata value if a new + * metadata value with same key is specified, if the replace parameter is + * set to true. + * + * Otherwise, this function behaves the same as + * {@link #addMetadata(Hashtable)}. + *

+ * + * @param metadata + * The metadata to merge the internal metadata with. + * @param replace + * If set to true, then an existing metadata value is replaced if + * a new metadata value with the same key is specified. + * Otherwise, if set to false then this function behaves as + * {@link #addMetadata(Hashtable)}. + * @since OODT-143 + */ + public void addMetadata(Hashtable metadata, boolean replace) { + // iterate through the keys and add values whereever possible, otherwise + // replace them + for (Iterator i = metadata.keySet().iterator(); i.hasNext();) { + String key = (String) i.next(); + List values = null; + + if (elementMap.get(key) != null) { + values = (List) elementMap.get(key); + if (replace) { + values.clear(); + } + } else { + values = new Vector(); + elementMap.put(key, values); + } + + if (metadata.get(key) != null) { + Object val = metadata.get(key); + + if (val instanceof List) { + values.addAll((List) val); + } else if (val instanceof String) { + values.add((String) val); + } + } + } + } + + /** + *

+ * Replaces the internal hashtable of metadata with the specified + * {@link Hashtable}. + *

+ * + * @param metadata + * The metadata to replace the existing internal {@Hashtable} + * with. + */ + public void replaceMetadata(Hashtable metadata) { + elementMap = new Hashtable(); + for (Iterator i = metadata.keySet().iterator(); i.hasNext();) { + String key = (String) i.next(); + Object val = metadata.get(key); + + List values = new Vector(); + if (val instanceof String) { + values.add((String) val); + } else if (val instanceof List) { + values.addAll((List) val); + } + + elementMap.put(key, values); + } + } + + /** + *

+ * Adds a single String value to this metadata key. If the key already + * exists, this value is appended to that list of metadata values. If the + * key doesn't exist yet, a new list of metadata values is created and then + * this value is inserted first, in order. + *

+ * + * @param key + * The key to add the value for. + * @param value + * The value to add. + */ + public void addMetadata(String key, String value) { + if (elementMap.get(key) != null) { + // append this value to the existing key + List values = (List) elementMap.get(key); + values.add(value); + } else { + List values = new Vector(); + values.add(value); + elementMap.put(key, values); + } + } + + /** + *

+ * Adds a list of values to this metadata key. If the key already exists + * then the list of values is appended to the existing list of values for + * the key, in order. If the key doesn't exist, the list of String values + * are set as the value list for this key. + *

+ * + * @param key + * The key to set the values for. + * @param values + * The ordered list of values for this String key. Values must be + * basic Strings. + */ + public void addMetadata(String key, List values) { + if (elementMap.get(key) != null) { + // get the existing values + List existingValues = (List) elementMap.get(key); + existingValues.addAll(values); + } else { + elementMap.put(key, values); + } + } + + /** + *

+ * Removes the existing value list for the specified key, + * and replaces it with the specified {@link List} of values. + *

+ * + * @param key + * The key to replace the metadata for. + * @param values + * The new metadata values for this key. + */ + public void replaceMetadata(String key, List values) { + Object value = removeMetadata(key); + value = null; + elementMap.put(key, values); + } + + /** + *

+ * Removes the existing value list for the specified key, + * and replaces it with the specified String value. + *

+ * + * @param key + * The key to replace the metadata for. + * @param value + * The new metadata value for this key. + */ + public void replaceMetadata(String key, String value) { + Object val = removeMetadata(key); + val = null; + List values = new Vector(); + values.add(value); + elementMap.put(key, values); + } + + /** + *

+ * Removes the value of the specified metadata key. + *

+ * + * @param key + * The key to remove the value from. + * @return The removed value. + */ + public Object removeMetadata(String key) { + return elementMap.remove(key); + } + + /** + *

+ * Gets all metadata String values mapped to the specified key. + *

+ * + * @param key + * The key to obtain multi-valued metadata for. + * @return all metadata String values mapped to the specified + * key. + */ + public List getAllMetadata(String key) { + if (elementMap.get(key) != null) { + return (List) elementMap.get(key); + } else + return null; + } + + /** + *

+ * Gets a single String value mapped to the specified + * key. + *

+ * + * @param key + * The key to obtain the single valued metadata for. + * @return A single String value mapped to the specified + * key. + */ + public String getMetadata(String key) { + if (elementMap.get(key) != null) { + List values = (List) elementMap.get(key); + if (values.size() == 0) { + return null; + } else { + return (String) values.get(0); + } + } else + return null; + } + + /** + * + * @return The internal {@link Hashtable} representation of the metadata. + */ + public Hashtable getHashtable() { + return (Hashtable) elementMap; + } + + /** + *

+ * Test for existence of the specified key in the metadata element map. + *

+ * + * @param key + * The key to check for existance of. + * @return True if the key exists in the Metadata, false otherwise. + */ + public boolean containsKey(String key) { + return elementMap.containsKey(key); + } + + /** + *

+ * Checks to see whether or not a particular key is a multi-valued key + * field. + *

+ * + * @param key + * The key to perform the multi-valued check on. + * @return True if the key is multi-valued, False, otherwise. + */ + public boolean isMultiValued(String key) { + if (elementMap.get(key) != null) { + List values = (List) elementMap.get(key); + + if (values != null) { + return values.size() > 1; + } else + return false; + } else + return false; + } + + public boolean equals(Object obj) { + if (obj instanceof Metadata) { + return ((Metadata) obj).elementMap.size() == this.elementMap.size() + && ((Metadata) obj).elementMap.entrySet().containsAll(this.elementMap.entrySet()); + }else + return false; + } + + /** + * @deprecated + *

+ * @see gov.nasa.jpl.oodt.cas.metadata.SerializableMetadata for new toXML usage. + * Returns an XML representation of this Metadata as an + * org.w3c.Document. + *

+ * + * @return an XML representation of this Metadata as an + * org.w3c.Document. + * @throws Exception + * If any error occurs. + */ + public Document toXML() throws Exception { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + Document document = null; + + try { + DocumentBuilder builder = factory.newDocumentBuilder(); + document = builder.newDocument(); + + Element root = (Element) document.createElement("cas:metadata"); + root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas"); + document.appendChild(root); + + // now add the set of metadata elements in the properties object + for (Iterator i = elementMap.keySet().iterator(); i.hasNext();) { + String elemName = null; + + try { + elemName = (String) i.next(); + List elemValues = (List) elementMap.get(elemName); + + Element metadataElem = document.createElement("keyval"); + Element keyElem = document.createElement("key"); + keyElem.appendChild(document.createTextNode(URLEncoder + .encode(elemName, "UTF-8"))); + + metadataElem.appendChild(keyElem); + + String type = "scalar"; + + if (elemValues.size() > 1) { + type = "vector"; + } + + metadataElem.setAttribute("type", type); + + for (Iterator j = elemValues.iterator(); j.hasNext();) { + String elemValue = (String) j.next(); + Element valElem = document.createElement("val"); + if (elemValue == null) { + throw new Exception("Attempt to write null value " + + "for property: [" + elemName + + "]: val: [" + elemValue + "]"); + } + valElem.appendChild(document.createTextNode(URLEncoder + .encode(elemValue, "UTF-8"))); + metadataElem.appendChild(valElem); + } + root.appendChild(metadataElem); + } catch (UnsupportedEncodingException e) { + LOG.log(Level.WARNING, "Error encoding metadata " + + elementMap + " to xml file!"); + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + + } + + } catch (ParserConfigurationException pce) { + LOG.log(Level.WARNING, "Error generating metadata xml file!: " + + pce.getMessage()); + throw new Exception("Error generating metadata xml file!: " + + pce.getMessage()); + } + + return document; + } + + /** + * @deprecated + * @param document + * @throws Exception + */ + private void parse(Document document) throws Exception { + + Element root = document.getDocumentElement(); + + NodeList keyValElems = root.getElementsByTagName("keyval"); + + for (int i = 0; i < keyValElems.getLength(); i++) { + Element keyValElem = (Element) keyValElems.item(i); + + String elemName = XMLUtils.read(keyValElem, "key"); + List elemValues = XMLUtils.readMany(keyValElem, "val"); + elementMap.put(elemName, elemValues); + } + + } + +} Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/SerializableMetadata.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/SerializableMetadata.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/SerializableMetadata.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/SerializableMetadata.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractionException.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractionException.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractionException.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractionException.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2006, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.exceptions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractorConfigReaderException.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractorConfigReaderException.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractorConfigReaderException.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/MetExtractorConfigReaderException.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.exceptions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/PreconditionComparatorException.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/PreconditionComparatorException.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/PreconditionComparatorException.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/exceptions/PreconditionComparatorException.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.exceptions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CmdLineMetExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CmdLineMetExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CmdLineMetExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CmdLineMetExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2007, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfig.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteConfigReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/CopyAndRewriteExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2007, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternConfigReaderMetKeys.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternMetExtractorMetKeys.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/ExternalMetExtractorConfig.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfig.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfig.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfig.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfig.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfigReader.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfigReader.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfigReader.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderConfigReader.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderExtractor.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderExtractor.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderExtractor.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/extractors/MetReaderExtractor.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2007, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.extractors; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/ExistanceCheckComparator.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/FileSizeComparator.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/FileSizeComparator.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/FileSizeComparator.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/FileSizeComparator.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/MimeTypeComparator.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/MimeTypeComparator.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/MimeTypeComparator.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/MimeTypeComparator.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreCondEvalUtils.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreCondEvalUtils.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreCondEvalUtils.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreCondEvalUtils.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionComparator.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionComparator.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionComparator.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionComparator.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/preconditions/PreConditionOperatorMetKeys.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2008, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.preconditions; Modified: incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/util/GenericMetadataObjectFactory.java URL: http://svn.apache.org/viewvc/incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/util/GenericMetadataObjectFactory.java?rev=934637&r1=934636&r2=934637&view=diff ============================================================================== --- incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/util/GenericMetadataObjectFactory.java (original) +++ incubator/oodt/cas-metadata/tags/1_6_1_release/src/main/java/gov/nasa/jpl/oodt/cas/metadata/util/GenericMetadataObjectFactory.java Thu Apr 15 23:01:09 2010 @@ -1,7 +1,20 @@ -//Copyright (c) 2007, California Institute of Technology. -//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged. -// -//$Id$ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package gov.nasa.jpl.oodt.cas.metadata.util;