incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964950 - in /incubator/oodt/trunk: ./ webapp/fmprod/ webapp/fmprod/src/main/java/org/apache/oodt/cas/product/ webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/ webapp/fmprod/src/main/resources/ webapp/fmprod/src/main/webapp/WEB-...
Date Fri, 16 Jul 2010 20:57:37 GMT
Author: kelly
Date: Fri Jul 16 20:57:36 2010
New Revision: 964950

URL: http://svn.apache.org/viewvc?rev=964950&view=rev
Log:
WIP OODT-15 OODT-16
"webapp/fmprod" now functional; add std ignores; replace gov.nasa.jpl with org.apache in package
decls, import statements, XML config files, and docs; update boilerplates with ASF copyright;
add FIXME notices re namespace URIs; update pom with newer junit, parent pom relative path,
and oodt-specific dependencies.

Modified:
    incubator/oodt/trunk/pom.xml
    incubator/oodt/trunk/webapp/fmprod/   (props changed)
    incubator/oodt/trunk/webapp/fmprod/pom.xml
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
    incubator/oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml
    incubator/oodt/trunk/webapp/fmprod/src/main/resources/rdfconf.xml
    incubator/oodt/trunk/webapp/fmprod/src/main/resources/rssconf.xml
    incubator/oodt/trunk/webapp/fmprod/src/main/webapp/WEB-INF/web.xml
    incubator/oodt/trunk/webapp/fmprod/src/test/org/apache/oodt/cas/product/rdf/TestRDFConfigReader.java
    incubator/oodt/trunk/webapp/fmprod/src/testdata/test.logging.properties

Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 20:57:36 2010
@@ -54,7 +54,7 @@ the License.
         <module>product</module>
         <module>profile</module>
         <module>webapp/filemgr</module>
-        <!-- broken: <module>webapp/fmprod</module> -->
+        <module>webapp/fmprod</module>
         <!-- broken: <module>webapp/workflow</module> -->
         <!-- broken: <module>app/fmbrowser</module> -->
     </modules>

Propchange: incubator/oodt/trunk/webapp/fmprod/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 20:57:36 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/webapp/fmprod/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/pom.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/pom.xml (original)
+++ incubator/oodt/trunk/webapp/fmprod/pom.xml Fri Jul 16 20:57:36 2010
@@ -1,18 +1,29 @@
-<?xml version="1.0"?>
-<!-- 
-  Copyright 2008 California Institute of Technology. ALL RIGHTS
-  RESERVED. U.S. Government Sponsorship acknowledged.
-  
-  $Id$
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>gov.nasa.jpl.oodt</groupId>
+    <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
-    <version>2.0</version>
+    <version>${oodt.version}</version>
+    <relativePath>../../core/pom.xml</relativePath>
   </parent>
   <artifactId>cas-product</artifactId>
   <packaging>war</packaging>
@@ -89,7 +100,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -99,38 +110,32 @@
       <scope>test</scope>
     </dependency>    
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-filemgr</artifactId>
-      <version>1.8.0</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>filemgr</artifactId>
+      <version>1.9.0-dev</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
+      <groupId>org.apache.oodt</groupId>
       <artifactId>cas-metadata</artifactId>
-      <version>1.6.1</version>
+      <version>${oodt.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-commons</artifactId>
-      <version>1.1.1</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-commons</artifactId>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
-      <groupId>oodt</groupId>
+      <groupId>org.apache.oodt</groupId>
       <artifactId>grid-product</artifactId>
-      <version>3.0.11</version>
+      <version>3.0.12-dev</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>oodt</groupId>
-      <artifactId>edm-commons</artifactId>
-      <version>2.2.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>edm-query</artifactId>
-      <version>2.0.8-dev</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>oodt-xmlquery</artifactId>
+      <version>${oodt.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
(original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
Fri Jul 16 20:57:36 2010
@@ -37,11 +37,11 @@ import org.apache.oodt.cas.filemgr.struc
 import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
 import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
 import org.apache.oodt.cas.product.data.DataUtils;
-import jpl.eda.product.LargeProductQueryHandler;
-import jpl.eda.product.ProductException;
-import jpl.eda.xmlquery.Header;
-import jpl.eda.xmlquery.LargeResult;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.product.LargeProductQueryHandler;
+import org.apache.oodt.product.ProductException;
+import org.apache.oodt.xmlquery.Header;
+import org.apache.oodt.xmlquery.LargeResult;
+import org.apache.oodt.xmlquery.XMLQuery;
 import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.*;
 import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.*;
 
@@ -66,7 +66,7 @@ public class CASProductHandler implement
     /*
      * (non-Javadoc)
      * 
-     * @see jpl.eda.product.QueryHandler#query(jpl.eda.xmlquery.XMLQuery)
+     * @see org.apache.product.QueryHandler#query(org.apache.xmlquery.XMLQuery)
      */
     public XMLQuery query(XMLQuery query) throws ProductException {
         // we'll only accept queries for ProductId=some_id
@@ -106,7 +106,7 @@ public class CASProductHandler implement
     /*
      * (non-Javadoc)
      * 
-     * @see jpl.eda.product.LargeProductQueryHandler#close(java.lang.String)
+     * @see org.apache.product.LargeProductQueryHandler#close(java.lang.String)
      */
     public void close(String id) throws ProductException {
         // doesn't really have to do anything b/c we're not going
@@ -117,7 +117,7 @@ public class CASProductHandler implement
     /*
      * (non-Javadoc)
      * 
-     * @see jpl.eda.product.LargeProductQueryHandler#retrieveChunk(java.lang.String,
+     * @see org.apache.product.LargeProductQueryHandler#retrieveChunk(java.lang.String,
      *      long, int)
      */
     public byte[] retrieveChunk(String id, long offset, int length)

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
(original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
Fri Jul 16 20:57:36 2010
@@ -56,7 +56,7 @@ import org.apache.oodt.cas.filemgr.struc
 import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
 import org.apache.oodt.commons.xml.XMLUtils;
 import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 /**
  * A Servlet that supports the <a
@@ -84,7 +84,7 @@ public class RSSProductServlet extends H
 
   private static final Map NS_MAP = new HashMap();
 
-  public static final String COPYRIGHT_BOILER_PLATE = "Copyright 2006: California Institute
of Technology";
+  public static final String COPYRIGHT_BOILER_PLATE = "Copyright 2010: Apache Software Foundation";
 
   public static final String RSS_FORMAT_STR = "E, dd MMM yyyy HH:mm:ss z";
 

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
(original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
Fri Jul 16 20:57:36 2010
@@ -53,7 +53,7 @@ import org.apache.oodt.cas.filemgr.struc
 import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
 import org.apache.oodt.commons.xml.XMLUtils;
 import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
 
 /**
  * @author mattmann
@@ -80,7 +80,7 @@ public class RSSProductTransferServlet e
 
     private static final Map NS_MAP = new HashMap();
 
-    public static final String COPYRIGHT_BOILER_PLATE = "Copyright 2006: California Institute
of Technology";
+    public static final String COPYRIGHT_BOILER_PLATE = "Copyright 2010: Apache Software
Foundation";
 
     public static final String RSS_FORMAT_STR = "E, dd MMM yyyy HH:mm:ss z";
 

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml Fri
Jul 16 20:57:36 2010
@@ -1,10 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
-  // 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.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <Context path="/fmprod" docBase="/path/to/cas-product.war" debug="5"
   reloadable="true" crossContext="true">
 

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/resources/rdfconf.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/resources/rdfconf.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/resources/rdfconf.xml (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/resources/rdfconf.xml Fri Jul 16 20:57:36
2010
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2009, 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.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 	
 	Author: Chris A. Mattmann
 	Description: Refactored the definition of the relevant CAS RDF
@@ -11,6 +22,7 @@
 	the CAS RDF web service.
  
 -->
+<!-- FIXME: adjust namespace URI? -->
 <cas:rdfconf xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
  <!-- 
    Here you can add as many &quot;ns&quot; tags as desired. Each 

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/resources/rssconf.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/resources/rssconf.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/resources/rssconf.xml (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/resources/rssconf.xml Fri Jul 16 20:57:36
2010
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2010, 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.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 	
 	Author: Chris A. Mattmann
 	Description: This file configures the CAS RSS web service. The
 	main aspects of this file are the ability to recast a product's 
 	metadata as relevant RSS compatiable tags.
 -->
+<!-- FIXME: adjust namespace URI? -->
 <cas:rssconf xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
   <!-- 
     An option "channelLink" attribute may be set on the above outer tag to 

Modified: incubator/oodt/trunk/webapp/fmprod/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/webapp/WEB-INF/web.xml?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/webapp/WEB-INF/web.xml Fri Jul 16 20:57:36
2010
@@ -1,9 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  // 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.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
@@ -29,27 +39,27 @@
 
   <servlet>
     <servlet-name>RSSServlet</servlet-name>
-    <servlet-class>gov.nasa.jpl.oodt.cas.product.rss.RSSProductServlet</servlet-class>
+    <servlet-class>org.apache.oodt.cas.product.rss.RSSProductServlet</servlet-class>
   </servlet>
   <servlet>
     <servlet-name>RSSTransferServlet</servlet-name>
-    <servlet-class>gov.nasa.jpl.oodt.cas.product.rss.RSSProductTransferServlet</servlet-class>
+    <servlet-class>org.apache.oodt.cas.product.rss.RSSProductTransferServlet</servlet-class>
   </servlet>
   <servlet>
     <servlet-name>RDFProductServlet</servlet-name>
-    <servlet-class>gov.nasa.jpl.oodt.cas.product.rdf.RDFProductServlet</servlet-class>
+    <servlet-class>org.apache.oodt.cas.product.rdf.RDFProductServlet</servlet-class>
   </servlet>
   <servlet>
       <servlet-name>RDFDatasetServlet</servlet-name>
-      <servlet-class>gov.nasa.jpl.oodt.cas.product.rdf.RDFDatasetServlet</servlet-class>
+      <servlet-class>org.apache.oodt.cas.product.rdf.RDFDatasetServlet</servlet-class>
   </servlet>
   <servlet>
     <servlet-name>DataDeliveryServlet</servlet-name>
-    <servlet-class>gov.nasa.jpl.oodt.cas.product.data.DataDeliveryServlet</servlet-class>
+    <servlet-class>org.apache.oodt.cas.product.data.DataDeliveryServlet</servlet-class>
   </servlet>
   <servlet>
     <servlet-name>DatasetDeliveryServlet</servlet-name>
-    <servlet-class>gov.nasa.jpl.oodt.cas.product.data.DatasetDeliveryServlet</servlet-class>
+    <servlet-class>org.apache.oodt.cas.product.data.DatasetDeliveryServlet</servlet-class>
   </servlet>
 
 

Modified: incubator/oodt/trunk/webapp/fmprod/src/test/org/apache/oodt/cas/product/rdf/TestRDFConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/test/org/apache/oodt/cas/product/rdf/TestRDFConfigReader.java?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/test/org/apache/oodt/cas/product/rdf/TestRDFConfigReader.java
(original)
+++ incubator/oodt/trunk/webapp/fmprod/src/test/org/apache/oodt/cas/product/rdf/TestRDFConfigReader.java
Fri Jul 16 20:57:36 2010
@@ -16,14 +16,14 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.product.rdf;
+package org.apache.oodt.cas.product.rdf;
 
 //JDK imports
 import java.io.ByteArrayInputStream;
 import org.w3c.dom.Document;
 
 //OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
 
 //JUnit imports
 import junit.framework.TestCase;

Modified: incubator/oodt/trunk/webapp/fmprod/src/testdata/test.logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/testdata/test.logging.properties?rev=964950&r1=964949&r2=964950&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/testdata/test.logging.properties (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/testdata/test.logging.properties Fri Jul 16 20:57:36
2010
@@ -1,8 +1,17 @@
-# Copyright (c) 2009 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.txt file distributed with
+# this work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# $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)
@@ -19,28 +28,28 @@ java.util.logging.ConsoleHandler.level =
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 # catalog subsystem
-gov.nasa.jpl.oodt.cas.filemgr.catalog.level = INFO
+org.apache.oodt.cas.filemgr.catalog.level = INFO
 
 # repository subsystem
-gov.nasa.jpl.oodt.cas.filemgr.repository.level = FINE
+org.apache.oodt.cas.filemgr.repository.level = FINE
 
 # system subsystem
-gov.nasa.jpl.oodt.cas.filemgr.system.level = INFO
+org.apache.oodt.cas.filemgr.system.level = INFO
 
 # versioning subsystem
-gov.nasa.jpl.oodt.cas.filemgr.versioning.level = INFO
+org.apache.oodt.cas.filemgr.versioning.level = INFO
 
 # data transfer subsystem
-gov.nasa.jpl.oodt.cas.filemgr.datatransfer.level = FINE
+org.apache.oodt.cas.filemgr.datatransfer.level = FINE
 
 # util
-gov.nasa.jpl.oodt.cas.filemgr.util.level = INFO
+org.apache.oodt.cas.filemgr.util.level = INFO
 
 # validation
-gov.nasa.jpl.oodt.cas.filemgr.validation.level = INFO
+org.apache.oodt.cas.filemgr.validation.level = INFO
 
 # tools
-gov.nasa.jpl.oodt.cas.filemgr.tools.level = SEVERE
+org.apache.oodt.cas.filemgr.tools.level = SEVERE
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO



Mime
View raw message