incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964147 [1/3] - in /incubator/oodt/trunk/commons: ./ src/main/java/gov/nasa/jpl/oodt/commons/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/oodt/ src/main/java/org/apache/oodt/commons/ src/main/java/org/apache/oodt/c...
Date Wed, 14 Jul 2010 19:32:44 GMT
Author: kelly
Date: Wed Jul 14 19:32:42 2010
New Revision: 964147

URL: http://svn.apache.org/viewvc?rev=964147&view=rev
Log:
WIP OODT-15 OODT-16
Add missing MySQL dependency. Restore missing Utility.java function and Net.java file. Transpose package hierarchy to org.apache.oodt. Adjust timing in HistoryTest. Make all unit tests pass. Remove executable bits on non-executable files. Nuke old image.

Added:
    incubator/oodt/trunk/commons/src/main/java/org/
    incubator/oodt/trunk/commons/src/main/java/org/apache/
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/
      - copied from r964122, incubator/oodt/trunk/commons/src/main/java/gov/nasa/jpl/oodt/commons/
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/net/
    incubator/oodt/trunk/commons/src/test/org/
    incubator/oodt/trunk/commons/src/test/org/apache/
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/
      - copied from r964122, incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/activity/
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/exec/
      - copied from r964122, incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/exec/
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/option/
      - copied from r964122, incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/option/
Removed:
    incubator/oodt/trunk/commons/src/main/java/gov/nasa/jpl/oodt/commons/
    incubator/oodt/trunk/commons/src/site/resources/images/cas-commons.psd
    incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/activity/
    incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/exec/
    incubator/oodt/trunk/commons/src/test/gov/nasa/jpl/oodt/commons/option/
Modified:
    incubator/oodt/trunk/commons/   (props changed)
    incubator/oodt/trunk/commons/pom.xml
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java   (contents, props changed)
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/exec/EnvUtilities.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/exec/ExecHelper.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/exec/ExecUtils.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/exec/StreamGobbler.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/filter/ObjectTimeEvent.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/filter/TimeEvent.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/filter/TimeEventWeightedHash.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/io/LoggerOutputStream.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/CmdLineOption.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/CmdLineOptionInstance.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/handler/BeanInfo.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/handler/CmdLineOptionBeanHandler.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/handler/CmdLineOptionHandler.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/handler/StdCmdLineOptionHandler.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/parser/CmdLineOptionParser.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/required/RequiredOption.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/util/CmdLineOptionUtils.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/util/CmdLineOptionsUsagePrinter.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/AllowedArgsCmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/ArgRegExpCmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/ClassExistsCmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/CmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/FileExistCmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/option/validator/NoRestrictionsCmdLineOptionValidator.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/pagination/PaginationUtils.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/spring/SpringSetIdInjectionType.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/spring/postprocessor/SetIdBeanPostProcessor.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/xml/DOMUtil.java
    incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/xml/XMLUtils.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/ActivityStoppedTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/ActivityTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/ActivityTrackerTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/CompositeActivityTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/DatagramLoggingActivityFactoryTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/HistoryTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/activity/IncidentTest.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/exec/TestEnvUtilities.java
    incubator/oodt/trunk/commons/src/test/org/apache/oodt/commons/option/handler/TestCmdLineOptionBeanHandler.java

Propchange: incubator/oodt/trunk/commons/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 14 19:32:42 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/pom.xml?rev=964147&r1=964146&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/pom.xml (original)
+++ incubator/oodt/trunk/commons/pom.xml Wed Jul 14 19:32:42 2010
@@ -83,6 +83,11 @@
       <version>2.0.8</version>
     </dependency>
     <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.13</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.2</version>

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java Wed Jul 14 19:32:42 2010
@@ -1,115 +1,128 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: Activity.java,v 1.2 2005-08-03 17:20:36 kelly Exp $
-
-package jpl.eda.activity;
-
-import java.net.InetAddress;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-import java.util.Random;
-
-/**
- * An activity is an occurrence of some active action.  It has a unique ID in the
- * universe, a way to log incidents that occur during the course of the activity, and a
- * way to indicate that the activity has stopped.
- *
- * @author Kelly
- * @version $Revision: 1.2 $
- */
-public abstract class Activity {
-	/**
-	 * Creates a new {@link Activity} instance.
-	 *
-	 */
-	protected Activity() {
-		setID(generateID());
-	}
-
-	/**
-	 * Change the activity's ID to the given value.
-	 *
-	 * @param id New ID.
-	 */
-	public void setID(String id) {
-		if (id == null) throw new IllegalArgumentException("ID required");
-		this.id = id;
-	}
-
-	/**
-	 * Get the activity's ID.
-	 *
-	 * @return a {@link String} ID.
-	 */
-	public String getID() {
-		return id;
-	}
-
-	/**
-	 * Stop this activity.  This method logs a <code>ActivityStopped</code> incident.  No
-	 * further incidents may be logged after calling this method.
-	 */
-	public synchronized void stop() {
-		if (!started) return;
-		this.started = false;
-		log(new ActivityStopped());
-	}
-
-	/**
-	 * Log the given incident.
-	 *
-	 * @param incident The incident to log.
-	 */
-	public final synchronized void log(Incident incident) {
-		incident.setActivityID(id);
-		recordIncident(incident);
-	}
-
-	/**
-	 * Record the given incident.
-	 *
-	 * @param incident an {@link Incident} value.
-	 */
-	protected abstract void recordIncident(Incident incident);
-
-	/**
-	 * Generate a unique ID for the activity based on Internet address, a unique
-	 * counter, the time, and some random bytes.
-	 *
-	 * @return a {@link String} value.
-	 */
-	private String generateID() {
-		try {
-			InetAddress addr = jpl.eda.net.Net.getLocalHost();	       // Get the local host's IP address
-			long nextNum = ++counter;				       // Get the next 64 bit number
-			Date date = new Date();					       // Get the current time
-			byte[] bytes = new byte[32];				       // Make space for 32 random bytes
-			RANDOM.nextBytes(bytes);				       // Fill in 32 random bytes
-			StringBuffer input = new StringBuffer();		       // Make space to put the 1st 3 components...
-			input.append(addr).append(nextNum).append(date);	       // ...together and put 'em together
-			MessageDigest messageDigest = MessageDigest.getInstance("MD5");// Prepare to take a hash
-			messageDigest.update(input.toString().getBytes());	       // Add the 1st 3 components
-			byte[] sig = messageDigest.digest(bytes);		       // And add the random bytes
-			StringBuffer output = new StringBuffer();		       // Make space to store the hash as a string
-			for (int i = 0; i < sig.length; ++i)			       // For each byte in the hash
-				output.append(Integer.toHexString(((int)sig[i])&0xff));// Store it as a hex value
-			return output.toString();				       // And return the string
-		} catch (NoSuchAlgorithmException ex) {
-			throw new IllegalStateException("MD5 algorithm not available");
-		}
-	}
-
-	/** Unique ID of the activity. */
-	protected String id;
-
-	/** Flag that tells if this activity is active. */
-	private boolean started = true;
-
-	/** Random number generator for unique IDs. */
-	private static final Random RANDOM = new Random();
-
-	/** Counter for unique IDs. */
-	private static long counter = 0;
-}
+/*
+ * 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 org.apache.oodt.commons.activity;
+
+import java.net.InetAddress;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+import java.util.Random;
+import org.apache.oodt.commons.net.Net;
+
+/**
+ * An activity is an occurrence of some active action.  It has a unique ID in the
+ * universe, a way to log incidents that occur during the course of the activity, and a
+ * way to indicate that the activity has stopped.
+ *
+ * @author Kelly
+ * @version $Revision: 1.2 $
+ */
+public abstract class Activity {
+	/**
+	 * Creates a new {@link Activity} instance.
+	 *
+	 */
+	protected Activity() {
+		setID(generateID());
+	}
+
+	/**
+	 * Change the activity's ID to the given value.
+	 *
+	 * @param id New ID.
+	 */
+	public void setID(String id) {
+		if (id == null) throw new IllegalArgumentException("ID required");
+		this.id = id;
+	}
+
+	/**
+	 * Get the activity's ID.
+	 *
+	 * @return a {@link String} ID.
+	 */
+	public String getID() {
+		return id;
+	}
+
+	/**
+	 * Stop this activity.  This method logs a <code>ActivityStopped</code> incident.  No
+	 * further incidents may be logged after calling this method.
+	 */
+	public synchronized void stop() {
+		if (!started) return;
+		this.started = false;
+		log(new ActivityStopped());
+	}
+
+	/**
+	 * Log the given incident.
+	 *
+	 * @param incident The incident to log.
+	 */
+	public final synchronized void log(Incident incident) {
+		incident.setActivityID(id);
+		recordIncident(incident);
+	}
+
+	/**
+	 * Record the given incident.
+	 *
+	 * @param incident an {@link Incident} value.
+	 */
+	protected abstract void recordIncident(Incident incident);
+
+	/**
+	 * Generate a unique ID for the activity based on Internet address, a unique
+	 * counter, the time, and some random bytes.
+	 *
+	 * @return a {@link String} value.
+	 */
+	private String generateID() {
+		try {
+			InetAddress addr = Net.getLocalHost();	                       // Get the local host's IP address
+			long nextNum = ++counter;				       // Get the next 64 bit number
+			Date date = new Date();					       // Get the current time
+			byte[] bytes = new byte[32];				       // Make space for 32 random bytes
+			RANDOM.nextBytes(bytes);				       // Fill in 32 random bytes
+			StringBuffer input = new StringBuffer();		       // Make space to put the 1st 3 components...
+			input.append(addr).append(nextNum).append(date);	       // ...together and put 'em together
+			MessageDigest messageDigest = MessageDigest.getInstance("MD5");// Prepare to take a hash
+			messageDigest.update(input.toString().getBytes());	       // Add the 1st 3 components
+			byte[] sig = messageDigest.digest(bytes);		       // And add the random bytes
+			StringBuffer output = new StringBuffer();		       // Make space to store the hash as a string
+			for (int i = 0; i < sig.length; ++i)			       // For each byte in the hash
+				output.append(Integer.toHexString(((int)sig[i])&0xff));// Store it as a hex value
+			return output.toString();				       // And return the string
+		} catch (NoSuchAlgorithmException ex) {
+			throw new IllegalStateException("MD5 algorithm not available");
+		}
+	}
+
+	/** Unique ID of the activity. */
+	protected String id;
+
+	/** Flag that tells if this activity is active. */
+	private boolean started = true;
+
+	/** Random number generator for unique IDs. */
+	private static final Random RANDOM = new Random();
+
+	/** Counter for unique IDs. */
+	private static long counter = 0;
+}

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java Wed Jul 14 19:32:42 2010
@@ -1,12 +1,24 @@
-// Copyright (c) 2005, California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-// 
-// $Id: ActivityException.java,v 1.1 2005-01-05 18:22:26 shardman Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 /**
-   This class is intended to be thrown as an exception in the jpl.eda.activity package.
+   This class is intended to be thrown as an exception in the org.apache.oodt.commons.activity package.
 
    @author S. Hardman
    @version $Revision: 1.1 $

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityException.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: ActivityFactory.java,v 1.1 2004-03-02 19:28:56 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 /**
  * Factory for activities.  Classes that implement this interface are responsible for

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityFactory.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: ActivityStopped.java,v 1.1 2004-03-02 19:28:56 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 /**
  * An incident that indicates that an activity has stopped.

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityStopped.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: ActivityTracker.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,7 +31,7 @@ import java.util.StringTokenizer;
  *
  * <p>The <code>ActivityTracker</code> generates activities using an {@link
  * ActivityFactory}.  It configures the factory by examining the system properties.  The
- * property <code>jpl.eda.activity.factories</code> (or the
+ * property <code>org.apache.oodt.commons.activity.factories</code> (or the
  * <code>activity.factories</code> property for those that prefer an abbreviated name and
  * the prior one isn't defined) is a comma- (or vertical bar-) seperated list of class
  * names.  Each class is expected to implement the {@link ActivityFactory} interface.  If
@@ -49,7 +61,7 @@ public class ActivityTracker {
 	 * @throws Exception if an error occurs.
 	 */
 	static void initializeFactories() throws Exception {
-		String facNames = System.getProperty("jpl.eda.activity.factories", System.getProperty("activity.factories", ""));
+		String facNames = System.getProperty("org.apache.oodt.commons.activity.factories", System.getProperty("activity.factories", ""));
 		List factories = new ArrayList();
 		for (StringTokenizer tokens = new StringTokenizer(facNames, ",|"); tokens.hasMoreTokens();) {
 			String factoryName = tokens.nextToken();

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/ActivityTracker.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: CompositeActivity.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.Collection;
 import java.util.Iterator;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/CompositeActivity.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: DatagramLogger.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLogger.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: DatagramLoggingActivityFactory.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -17,11 +29,11 @@ import java.net.UnknownHostException;
 /**
  * This activity factory produces activities that log their incidents using datagrams.  It
  * examines the system properties to determine where to send the incidents.  The property
- * <code>jpl.eda.activity.DatagramLoggingActivityFactory.host</code> (or
+ * <code>org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.host</code> (or
  * <code>activity.host</code> if not defined) teslls to what host to send the datagrams.
  * There's no default value, and it's an runtime exception if neither property's defined.
  *
- * <p>The property <code>jpl.eda.activity.DatagramLoggingActivityFactory.port</code> (or
+ * <p>The property <code>org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.port</code> (or
  * <code>activity.port</code> if not defined) tells to what port to send the datagrams.
  * It defaults to 4556.
  *
@@ -37,12 +49,12 @@ public class DatagramLoggingActivityFact
 	 * Creates a new {@link DatagramLoggingActivityFactory} instance.
 	 */
 	public DatagramLoggingActivityFactory() {
-		String hostname = System.getProperty("jpl.eda.activity.DatagramLoggingActivityFactory.host",
+		String hostname = System.getProperty("org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.host",
 			System.getProperty("activity.host", ""));
-		port = Integer.getInteger("jpl.eda.activity.DatagramLoggingActivityFactory.port",
+		port = Integer.getInteger("org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.port",
 			Integer.getInteger("activity.port", 4556)).intValue();
 		if (hostname.length() == 0)
-			throw new IllegalStateException("System property `jpl.eda.activity.DatagramLoggingActivityFactory.host'"
+			throw new IllegalStateException("System property `org.apache.oodt.commons.activity.DatagramLoggingActivityFactory.host'"
 				+ " (or simply `activity.host') not defined or is empty");
 		try {
 			host = InetAddress.getByName(hostname);

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/DatagramLoggingActivityFactory.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: History.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -138,8 +150,8 @@ final class History {
  	private static final Timer TIMER = new Timer(/*isDaemon*/true);
 
 	/** How many milliseconds to wait before giving up on an idle history. */
-	static long idleTime = Long.getLong("jpl.eda.activity.History.idle", 5*60*1000).longValue();
+	static long idleTime = Long.getLong("org.apache.oodt.commons.activity.History.idle", 5*60*1000).longValue();
 
 	/** How many milliseconds to wait to give a history extra time to receive incidents before saving it to storage. */
-	static long closeTime = Long.getLong("jpl.eda.activity.History.close", 5*60*1000).longValue();
+	static long closeTime = Long.getLong("org.apache.oodt.commons.activity.History.close", 5*60*1000).longValue();
 }

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/History.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: Incident.java,v 1.3 2005-08-03 17:22:11 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.Serializable;
 import java.util.Date;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Incident.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: MySQLStorage.java,v 1.1 2004-03-02 19:28:57 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import javax.sql.DataSource;
 import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
@@ -15,9 +27,9 @@ import java.util.List;
 
 public class MySQLStorage implements Storage {
 	public MySQLStorage() {
-		String url = System.getProperty("jpl.eda.activity.MySQLStorage.url", System.getProperty("activity.url", ""));
+		String url = System.getProperty("org.apache.oodt.commons.activity.MySQLStorage.url", System.getProperty("activity.url", ""));
 		if (url.length() == 0)
-			throw new IllegalStateException("Required system property `jpl.eda.activity.MySQLStorage.url'"
+			throw new IllegalStateException("Required system property `org.apache.oodt.commons.activity.MySQLStorage.url'"
 				+ " (or just `activity.url') not defined or is empty");
 		try {
 			DataSource ds = new MysqlDataSource();

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/MySQLStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: NullActivity.java,v 1.1 2004-03-02 19:28:58 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 /**
  * A null activity doesn't record any incidents.

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullActivity.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: NullStorage.java,v 1.1 2004-03-02 19:28:58 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.List;
 

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/NullStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2005 California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
-//
-// $Id: Retrieval.java,v 1.1 2005-01-05 18:22:26 shardman Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.sql.SQLException;
 import java.util.List;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Retrieval.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright (c) 2005 California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
-//
-// $Id: SQLDatabaseRetrieval.java,v 1.1 2005-01-05 18:22:26 shardman Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -22,7 +34,7 @@ import java.util.List;
 
    <p>This class uses the following properties:
    <ul>
-      <li><code>jpl.eda.activity.SQLDatabaseRetrieval.driver</code><br>
+      <li><code>org.apache.oodt.commons.activity.SQLDatabaseRetrieval.driver</code><br>
       Must contain the name of the JDBC driver class. See the following
       examples:
       <ul>
@@ -33,7 +45,7 @@ import java.util.List;
       </ul>
       </li>
 
-      <li><code>jpl.eda.activity.SQLDatabaseRetrieval.url</code><br>
+      <li><code>org.apache.oodt.commons.activity.SQLDatabaseRetrieval.url</code><br>
       Must contain the URL specification for the target database. See the
       following examples:
       <ul>
@@ -44,10 +56,10 @@ import java.util.List;
       </ul>
       </li>
 
-      <li><code>jpl.eda.activity.SQLDatabaseRetrieval.user</code><br>
+      <li><code>org.apache.oodt.commons.activity.SQLDatabaseRetrieval.user</code><br>
       Must contain the user name for the target database.</li>
 
-      <li><code>jpl.eda.activity.SQLDatabaseRetrieval.password</code><br>
+      <li><code>org.apache.oodt.commons.activity.SQLDatabaseRetrieval.password</code><br>
       Must contain the password for the target database.</li>
 
    </ul>
@@ -97,13 +109,13 @@ public class SQLDatabaseRetrieval implem
    public SQLDatabaseRetrieval() {
 
       // Grab the properties and make sure they are all there.
-      driver = System.getProperty("jpl.eda.activity.SQLDatabaseRetrieval.driver");
-      url = System.getProperty("jpl.eda.activity.SQLDatabaseRetrieval.url");
-      user = System.getProperty("jpl.eda.activity.SQLDatabaseRetrieval.user");
-      password = System.getProperty("jpl.eda.activity.SQLDatabaseRetrieval.password");
+      driver = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseRetrieval.driver");
+      url = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseRetrieval.url");
+      user = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseRetrieval.user");
+      password = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseRetrieval.password");
 
       if ((driver == null) || (url == null) || (user == null) || (password == null)) {
-         throw new IllegalStateException("SQLDatabaseRetrieval(): Required system properties `jpl.eda.activity.SQLDatabaseRetrieval.[driver,url,user,password]' are not completely defined.");
+         throw new IllegalStateException("SQLDatabaseRetrieval(): Required system properties `org.apache.oodt.commons.activity.SQLDatabaseRetrieval.[driver,url,user,password]' are not completely defined.");
       }
    }
 
@@ -203,4 +215,4 @@ public class SQLDatabaseRetrieval implem
          System.exit(1);
       }
    }
-}
\ No newline at end of file
+}

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseRetrieval.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java Wed Jul 14 19:32:42 2010
@@ -1,144 +1,195 @@
-// Copyright (c) 2004 California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
-//
-// $Id: SQLDatabaseStorage.java,v 1.2 2005-01-04 00:49:14 shardman Exp $
-
-package jpl.eda.activity;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Iterator;
-import java.util.List;
-import jpl.eda.util.Utility;
-
-/**
-	<p>This class enables storage of activity incidents in just about
-	any database management system. It should support MySQL, PostgreSQL,
-	Oracle and Sybase.</p>
-
-	<p>This class uses the following properties:
-	<ul>
-		<li><code>jpl.eda.activity.SQLDatabaseStorage.driver</code><br>
-		Must contain the name of the JDBC driver class. See the following
-		examples:
-		<ul>
-			<li>com.mysql.jdbc.Driver</li>
-			<li>org.postgresql.Driver</li>
-			<li>oracle.jdbc.driver.OracleDriver</li>
-			<li>com.sybase.jdbc2.jdbc.SybDriver</li>
-		</ul>
-		</li>
-
-		<li><code>jpl.eda.activity.SQLDatabaseStorage.url</code><br>
-		Must contain the URL specification for the target database. See the
-		following examples:
-		<ul>
-			<li>jdbc:mysql://host:port/database</li>
-			<li>jdbc:postgresql://host:port/database</li>
-			<li>jdbc:oracle:thin:@host:port:database</li>
-			<li>jdbc:sybase::Tds:host:port/database</li>
-		</ul>
-		</li>
-
-		<li><code>jpl.eda.activity.SQLDatabaseStorage.user</code><br>
-		Must contain the user name for the target database.</li>
-
-		<li><code>jpl.eda.activity.SQLDatabaseStorage.password</code><br>
-		Must contain the password for the target database.</li>
-
-	</ul>
-	</p>
-
-	<p>This class expects the following table to exist in the target
-	database (data types will vary depending on the vendor):<br>
-		<pre>
-      create table incidents (
-         activityID varchar(32) not null,
-         className varchar(255) not null,
-         occurTime bigint not null default 0,
-         detail text null,
-         primary key (activityID, className, occurTime))
-		</pre>
-	</p>
-
-	@author S. Hardman
-	@version $Revision: 1.2 $
-*/
-public class SQLDatabaseStorage implements Storage {
-
-	/**
-		The database connection.
-	*/
-	private Connection connection;
-
-
-	/**
-		Constructor given no arguments.
-
-		This constructor grabs the necessary system properties and opens
-		the database connection based on the property values.
-	*/
-	public SQLDatabaseStorage() {
-
-		// Grab the properties and make sure they are all there.
-		String driver = System.getProperty("jpl.eda.activity.SQLDatabaseStorage.driver");
-		String url = System.getProperty("jpl.eda.activity.SQLDatabaseStorage.url");
-		String user = System.getProperty("jpl.eda.activity.SQLDatabaseStorage.user");
-		String password = System.getProperty("jpl.eda.activity.SQLDatabaseStorage.password");
-
-		if ((driver == null) || (url == null) || (user == null) || (password == null)) {
-			throw new IllegalStateException("SQLDatabaseStorage(): Required system properties `jpl.eda.activity.SQLDatabaseStorage.[driver,url,user,password]' are not completely defined.");
-		}
-
-		try {
-			// Open the database connection.
-         Class.forName(driver);
-         connection = DriverManager.getConnection(url, user, password);
-		}
-		catch (ClassNotFoundException e) {
-			throw new IllegalStateException("SQLDatabaseStorage(): An exception occurred locating the JDBC driver class. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'"); 
-		}
-		catch (SQLException e) {
-			throw new IllegalStateException("SQLDatabaseStorage(): An exception occurred connecting to the database. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'");
-		}
-	}
-
-
-	/**
-		This method stores the list of incidents for the activity in the
-		database table named "incidents".
-
-		@param id The activity identifier.
-		@param incidents A list of {@link Incident}.
-	*/
-	public void store(String id, List incidents) {
-		Statement statement = null;
-		try {
-			statement = connection.createStatement();
-			for (Iterator i = incidents.iterator(); i.hasNext();) {
-				Incident incident = (Incident) i.next();
-				statement.executeUpdate("insert into incidents (activityID, className, occurTime, detail) values ('" + id + "', '" + incident.getClass().getName() + "', " + incident.getTime().getTime() + ", '" + Utility.escapeSingleQuote(incident.toString()) + "')");
-			}
-		} catch (SQLException e) {
-			System.err.println("SQLDatabaseStorage.store(): Ignoring an exception that occurred while inserting a row into the database. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'");
-		} finally {
-			if (statement != null) try {
-				statement.close();
-			} catch (SQLException ignore) {}
-		}
-	}
-
-
-	/**
-		This method closes the database connection.
-
-		@throws Throwable If something goes wrong.
-	*/
-	public void finalize() throws Throwable {
-		connection.close();
-		super.finalize();
-	}
-}
-
+/*
+ * 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 org.apache.oodt.commons.activity;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+	<p>This class enables storage of activity incidents in just about
+	any database management system. It should support MySQL, PostgreSQL,
+	Oracle and Sybase.</p>
+
+	<p>This class uses the following properties:
+	<ul>
+		<li><code>org.apache.oodt.commons.activity.SQLDatabaseStorage.driver</code><br>
+		Must contain the name of the JDBC driver class. See the following
+		examples:
+		<ul>
+			<li>com.mysql.jdbc.Driver</li>
+			<li>org.postgresql.Driver</li>
+			<li>oracle.jdbc.driver.OracleDriver</li>
+			<li>com.sybase.jdbc2.jdbc.SybDriver</li>
+		</ul>
+		</li>
+
+		<li><code>org.apache.oodt.commons.activity.SQLDatabaseStorage.url</code><br>
+		Must contain the URL specification for the target database. See the
+		following examples:
+		<ul>
+			<li>jdbc:mysql://host:port/database</li>
+			<li>jdbc:postgresql://host:port/database</li>
+			<li>jdbc:oracle:thin:@host:port:database</li>
+			<li>jdbc:sybase::Tds:host:port/database</li>
+		</ul>
+		</li>
+
+		<li><code>org.apache.oodt.commons.activity.SQLDatabaseStorage.user</code><br>
+		Must contain the user name for the target database.</li>
+
+		<li><code>org.apache.oodt.commons.activity.SQLDatabaseStorage.password</code><br>
+		Must contain the password for the target database.</li>
+
+	</ul>
+	</p>
+
+	<p>This class expects the following table to exist in the target
+	database (data types will vary depending on the vendor):<br>
+		<pre>
+      create table incidents (
+         activityID varchar(32) not null,
+         className varchar(255) not null,
+         occurTime bigint not null default 0,
+         detail text null,
+         primary key (activityID, className, occurTime))
+		</pre>
+	</p>
+
+	@author S. Hardman
+	@version $Revision: 1.2 $
+*/
+public class SQLDatabaseStorage implements Storage {
+
+	/**
+		The database connection.
+	*/
+	private Connection connection;
+
+
+	/**
+		Constructor given no arguments.
+
+		This constructor grabs the necessary system properties and opens
+		the database connection based on the property values.
+	*/
+	public SQLDatabaseStorage() {
+
+		// Grab the properties and make sure they are all there.
+		String driver = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseStorage.driver");
+		String url = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseStorage.url");
+		String user = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseStorage.user");
+		String password = System.getProperty("org.apache.oodt.commons.activity.SQLDatabaseStorage.password");
+
+		if ((driver == null) || (url == null) || (user == null) || (password == null)) {
+			throw new IllegalStateException("SQLDatabaseStorage(): Required system properties `org.apache.oodt.commons.activity.SQLDatabaseStorage.[driver,url,user,password]' are not completely defined.");
+		}
+
+		try {
+			// Open the database connection.
+         Class.forName(driver);
+         connection = DriverManager.getConnection(url, user, password);
+		}
+		catch (ClassNotFoundException e) {
+			throw new IllegalStateException("SQLDatabaseStorage(): An exception occurred locating the JDBC driver class. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'"); 
+		}
+		catch (SQLException e) {
+			throw new IllegalStateException("SQLDatabaseStorage(): An exception occurred connecting to the database. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'");
+		}
+	}
+
+
+	/**
+		This method stores the list of incidents for the activity in the
+		database table named "incidents".
+
+		@param id The activity identifier.
+		@param incidents A list of {@link Incident}.
+	*/
+	public void store(String id, List incidents) {
+		Statement statement = null;
+		try {
+			statement = connection.createStatement();
+			for (Iterator i = incidents.iterator(); i.hasNext();) {
+				Incident incident = (Incident) i.next();
+				statement.executeUpdate("insert into incidents (activityID, className, occurTime, detail) values ('" + id + "', '" + incident.getClass().getName() + "', " + incident.getTime().getTime() + ", '" + escapeSingleQuote(incident.toString()) + "')");
+			}
+		} catch (SQLException e) {
+			System.err.println("SQLDatabaseStorage.store(): Ignoring an exception that occurred while inserting a row into the database. Specifically, exception '" + e.getClass().getName() + "' occurred with message '" + e.getMessage() + "'");
+		} finally {
+			if (statement != null) try {
+				statement.close();
+			} catch (SQLException ignore) {}
+		}
+	}
+
+
+	/**
+		This method closes the database connection.
+
+		@throws Throwable If something goes wrong.
+	*/
+	public void finalize() throws Throwable {
+		connection.close();
+		super.finalize();
+	}
+	
+	/**
+    	* This method will escape any single quotes found in the input string
+    	* and return the escaped string. This will ready the string for
+	* insertion into a database. The single quote is escaped by inserting
+	* an additional single quote in front of it in the string. If some
+	* considerate developer has already escaped the single quotes in the
+	* input string, this method will essentially do nothing.
+	*
+	* @param inputString The string to be escaped.
+	* @return The escaped string.
+	*/
+	public static String escapeSingleQuote(String inputString) {
+		int index = inputString.indexOf('\'');
+		if (index == -1) {
+			return (inputString);
+		}
+
+		String outputString = inputString;
+		while (index != -1) {
+
+			// If the single quote is the last character in the string or 
+			// the next character is not another single quote, insert a
+			// single quote in front of the current single quote.
+			if ((index == (outputString.length() - 1)) || (outputString.charAt(index + 1) != '\'')) {
+				outputString = outputString.substring(0, index) + "'" + outputString.substring(index);
+			}
+
+			// If we are not at the end of the string, check for another
+			// single quote.
+			if ((index + 2) <= (outputString.length() - 1)) {
+				index = outputString.indexOf('\'', index + 2);
+			}
+			else {
+				index = -1;
+			}
+		}
+		return (outputString);
+	}
+}
+
+

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/SQLDatabaseStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: StandardOutputStorage.java,v 1.1 2004-03-02 19:28:58 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.OutputStreamWriter;
 

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StandardOutputStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: Storage.java,v 1.2 2005-08-03 17:19:44 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.List;
 

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/Storage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright (c) 2005, California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-// 
-// $Id: StoredActivity.java,v 1.1 2005-01-05 18:22:26 shardman Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.ArrayList;
 import java.util.List;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredActivity.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright (c) 2005, California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-// 
-// $Id: StoredIncident.java,v 1.1 2005-01-05 18:22:26 shardman Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 
 /**

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/StoredIncident.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: WriterStorage.java,v 1.1 2004-03-02 19:28:58 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.util.List;
 import java.io.Writer;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/WriterStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: XMLStandardOutputStorage.java,v 1.1 2004-03-02 19:28:58 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.IOException;
 import javax.xml.transform.Transformer;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStandardOutputStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java Wed Jul 14 19:32:42 2010
@@ -1,9 +1,21 @@
-// Copyright 2003 California Institute of Technology.  ALL RIGHTS RESERVED.
-// U.S. Government Sponsorship acknowledged.
-//
-// $Id: XMLStorage.java,v 1.1 2004-03-02 19:28:59 kelly Exp $
+/*
+ * 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 jpl.eda.activity;
+package org.apache.oodt.commons.activity;
 
 import java.io.IOException;
 import java.util.Iterator;

Propchange: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/activity/XMLStorage.java
            ('svn:executable' removed)

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/DatabaseConnectionBuilder.java Wed Jul 14 19:32:42 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.commons.database;
+package org.apache.oodt.commons.database;
 
 //JDK imports
 import javax.sql.DataSource;

Modified: incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java?rev=964147&r1=964122&r2=964147&view=diff
==============================================================================
--- incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java (original)
+++ incubator/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/database/SqlScript.java Wed Jul 14 19:32:42 2010
@@ -16,7 +16,7 @@
  */
 
 
-package gov.nasa.jpl.oodt.cas.commons.database;
+package org.apache.oodt.commons.database;
 
 //JDK imports
 import java.io.BufferedReader;



Mime
View raw message