Author: woollard
Date: Thu Jul 22 18:06:10 2010
New Revision: 966775
URL: http://svn.apache.org/viewvc?rev=966775&view=rev
Log:
header updates to the metadata subproject. work toward OODT-3
Modified:
incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd
incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd
incubator/oodt/trunk/metadata/src/main/cpp/Makefile
incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp
incubator/oodt/trunk/metadata/src/main/cpp/Metadata.h
incubator/oodt/trunk/metadata/src/main/cpp/XStr.h
incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml
incubator/oodt/trunk/metadata/src/main/cpp/testMetadata.cpp
incubator/oodt/trunk/metadata/src/main/resources/logging.properties
Modified: incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd (original)
+++ incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd Thu Jul 22
18:06:10 2010
@@ -1,19 +1,30 @@
<!--
- Copyright (c) 2006, California Institute of Technology.
- ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
- $Id$
-
- A Multi-valued, generic Metadata container schema. The class uses a map of
- string keys pointing to vectors of strings. The data structure looks like
- the following:
-
-[std:string key]=><std:vector of std:strings>
-
-The multi-valued nature of the class is handled transparently by this Metadata
-container. Since all values are stored internally as string vectors, the
difference
-between a scalar value and a non-scalar is handled by determing whether the
list of
-values for a particular key is greater than 1.
+ 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.
+-->
+<!--
+ A Multi-valued, generic Metadata container schema. The class uses a map of
+ string keys pointing to vectors of strings. The data structure looks like
+ the following:
+
+ [std:string key]=><std:vector of std:strings>
+
+ The multi-valued nature of the class is handled transparently by this Metadata
+ container. Since all values are stored internally as string vectors, the
difference
+ between a scalar value and a non-scalar is handled by determing whether the
list of
+ values for a particular key is greater than 1.
-->
<!ELEMENT metadata (keyval)*>
Modified: incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd (original)
+++ incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd Thu Jul 22
18:06:10 2010
@@ -1,20 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
+-->
+<!--
A Multi-valued, generic Metadata container schema. The class uses a map of
string keys pointing to vectors of strings. The data structure looks like
the following:
-[std:string key]=><std:vector of std:strings>
+ [std:string key]=><std:vector of std:strings>
-The multi-valued nature of the class is handled transparently by this Metadata
-container. Since all values are stored internally as string vectors, the
difference
-between a scalar value and a non-scalar is handled by determing whether the
list of
-values for a particular key is greater than 1.
+ The multi-valued nature of the class is handled transparently by this Metadata
+ container. Since all values are stored internally as string vectors, the
difference
+ between a scalar value and a non-scalar is handled by determing whether the
list of
+ values for a particular key is greater than 1.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
<xs:element name="key" type="xs:string"/>
Modified: incubator/oodt/trunk/metadata/src/main/cpp/Makefile
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/Makefile?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/Makefile (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/Makefile Thu Jul 22 18:06:10 2010
@@ -1,3 +1,18 @@
+# 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.
+
# make the Metadata library
#
CFLAGS= -g -Wall
@@ -19,4 +34,4 @@ XMLUtils.o: ./util/xml/XMLUtils.h
test: XMLUtils.o metadata.o
$(CC) -g metadata.o XMLUtils.o testMetadata.cpp $(LIBRARIES) -o
test
-
\ No newline at end of file
+
Modified: incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp Thu Jul 22 18:06:10
2010
@@ -1,7 +1,19 @@
-//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.
+*/
#ifndef METADATA_CPP_
#define METADATA_CPP_
@@ -39,8 +51,6 @@ namespace cas
{
/**********************************************************************
-...@author mattmann
-
Implementation of the Metadata container methods.
***********************************************************************/
Modified: incubator/oodt/trunk/metadata/src/main/cpp/Metadata.h
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/Metadata.h?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/Metadata.h (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/Metadata.h Thu Jul 22 18:06:10
2010
@@ -1,7 +1,19 @@
-//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.
+*/
#ifndef METADATA_H_
#define METADATA_H_
@@ -21,8 +33,6 @@ namespace cas
{
/**********************************************************************
-...@author mattmann
-
A Multi-valued, generic Metadata container class. The class uses an internal
STL map of STL string keys pointing to STL vectors of STL strings. The data
structure looks like the following:
Modified: incubator/oodt/trunk/metadata/src/main/cpp/XStr.h
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/XStr.h?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/XStr.h (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/XStr.h Thu Jul 22 18:06:10 2010
@@ -1,7 +1,19 @@
-//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.
+*/
#ifndef _XSTR_H_
#define _XSTR_H_
Modified: incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml Thu Jul 22
18:06:10 2010
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!--
+ 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.
+-->
<!-- FIXME: change namespace URI? -->
<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";>
@@ -30,4 +46,4 @@
<val>key6_replaced_val1</val>
</keyval>
-</cas:metadata>
\ No newline at end of file
+</cas:metadata>
Modified: incubator/oodt/trunk/metadata/src/main/cpp/testMetadata.cpp
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/testMetadata.cpp?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/testMetadata.cpp (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/testMetadata.cpp Thu Jul 22
18:06:10 2010
@@ -1,7 +1,19 @@
-//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.
+*/
#include "Metadata.h"
#include <string>
@@ -25,8 +37,6 @@ using namespace std;
using namespace cas;
/**********************************************************************
-...@author mattmann
-
Pseudo-unit tests for the Metadata container.
***********************************************************************/
Modified: incubator/oodt/trunk/metadata/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/resources/logging.properties?rev=966775&r1=966774&r2=966775&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/resources/logging.properties
(original)
+++ incubator/oodt/trunk/metadata/src/main/resources/logging.properties Thu Jul
22 18:06:10 2010
@@ -1,8 +1,17 @@
-# Copyright (c) 2008 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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
#
-# $Id$
-
+# 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.
# Specify the handlers to create in the root logger
# (all loggers are children of the root logger)
