notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2445 - in development/main/transit: core/handler/src/main/net/dpml/io core/handler/src/main/net/dpml/lang core/handler/src/main/net/dpml/transit core/handler/src/main/net/dpml/transit/adapter core/handler/src/main/net/dpml/transit/artifact core/handler/src/main/net/dpml/transit/host core/handler/src/main/net/dpml/transit/monitors core/handler/src/main/net/dpml/transit/repository core/handler/src/main/net/dpml/transit/util core/handler/src/test/net/dpml/transit/repository core/handler/src/test/net/dpml/transit/test core/tools/src/main/net/dpml/transit/tools util/cli/src/main/net/dpml/cli util/criteria/src/main/net/dpml/criteria util/exception/src/main/net/dpml/exception util/exception/src/test/net/dpml/exception util/i18n/src/main/net/dpml/i18n util/i18n/src/test/net/dpml/i18n/test

From: niclas AT hedhman.org
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2445 - in development/main/transit: core/handler/src/main/net/dpml/io core/handler/src/main/net/dpml/lang core/handler/src/main/net/dpml/transit core/handler/src/main/net/dpml/transit/adapter core/handler/src/main/net/dpml/transit/artifact core/handler/src/main/net/dpml/transit/host core/handler/src/main/net/dpml/transit/monitors core/handler/src/main/net/dpml/transit/repository core/handler/src/main/net/dpml/transit/util core/handler/src/test/net/dpml/transit/repository core/handler/src/test/net/dpml/transit/test core/tools/src/main/net/dpml/transit/tools util/cli/src/main/net/dpml/cli util/criteria/src/main/net/dpml/criteria util/exception/src/main/net/dpml/exception util/exception/src/test/net/dpml/exception util/i18n/src/main/net/dpml/i18n util/i18n/src/test/net/dpml/i18n/test
Date: Thu, 28 Apr 2005 19:44:25 -0400

Author: niclas AT hedhman.org
Date: Thu Apr 28 19:44:22 2005
New Revision: 2445

Modified:

development/main/transit/core/handler/src/main/net/dpml/io/CascadingIOException.java

development/main/transit/core/handler/src/main/net/dpml/io/ResourceNotFoundException.java

development/main/transit/core/handler/src/main/net/dpml/lang/DefaultInvocationHandler.java

development/main/transit/core/handler/src/main/net/dpml/transit/Environment.java

development/main/transit/core/handler/src/main/net/dpml/transit/EnvironmentException.java
development/main/transit/core/handler/src/main/net/dpml/transit/Main.java

development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/Adapter.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/CacheMonitorAdapter.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConnectionMonitorAdapter.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConsoleAdapter.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ExceptionHelper.java

development/main/transit/core/handler/src/main/net/dpml/transit/adapter/NetworkMonitorAdapter.java

development/main/transit/core/handler/src/main/net/dpml/transit/artifact/Artifact.java

development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactAlreadyExistsException.java

development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactException.java

development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactNotFoundException.java

development/main/transit/core/handler/src/main/net/dpml/transit/host/XMLHostsBuilder.java

development/main/transit/core/handler/src/main/net/dpml/transit/monitors/CacheMonitor.java

development/main/transit/core/handler/src/main/net/dpml/transit/monitors/ConnectionMonitor.java

development/main/transit/core/handler/src/main/net/dpml/transit/monitors/NetworkMonitor.java

development/main/transit/core/handler/src/main/net/dpml/transit/repository/Plugin.java

development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java

development/main/transit/core/handler/src/main/net/dpml/transit/repository/RepositoryException.java

development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardClassLoader.java

development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java

development/main/transit/core/handler/src/main/net/dpml/transit/util/Dictionary.java

development/main/transit/core/handler/src/main/net/dpml/transit/util/ElementHelper.java

development/main/transit/core/handler/src/test/net/dpml/transit/repository/PropertiesPluginTestCase.java

development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java

development/main/transit/core/handler/src/test/net/dpml/transit/test/OfflineTestCase.java

development/main/transit/core/handler/src/test/net/dpml/transit/test/OnlineTestCase.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/AntAdapter.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/GetTask.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/ImportArtifactTask.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/MainTask.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/MapDataType.java

development/main/transit/core/tools/src/main/net/dpml/transit/tools/PluginTask.java

development/main/transit/util/cli/src/main/net/dpml/cli/ArgumentHandler.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/Criteria.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaException.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaRuntimeException.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/PackedParameter.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/Parameter.java

development/main/transit/util/criteria/src/main/net/dpml/criteria/URLParameter.java

development/main/transit/util/exception/src/main/net/dpml/exception/ExceptionHelper.java

development/main/transit/util/exception/src/test/net/dpml/exception/ExceptionHelperTest.java

development/main/transit/util/exception/src/test/net/dpml/exception/StandardError.java

development/main/transit/util/exception/src/test/net/dpml/exception/StandardException.java

development/main/transit/util/exception/src/test/net/dpml/exception/StandardRuntimeException.java

development/main/transit/util/i18n/src/main/net/dpml/i18n/ResourceManager.java
development/main/transit/util/i18n/src/main/net/dpml/i18n/Resources.java

development/main/transit/util/i18n/src/test/net/dpml/i18n/test/ResourceManagerTestCase.java
Log:
Change of author tag to something more long-term stable, i.e.
http://www.dpml.net.

Modified:
development/main/transit/core/handler/src/main/net/dpml/io/CascadingIOException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/io/CascadingIOException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/io/CascadingIOException.java
Thu Apr 28 19:44:22 2005
@@ -1,16 +1,16 @@
-/*
+/*
* Copyright 2004 Apache Software Foundation
* Licensed 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
- *
+ * 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.
*/
@@ -22,7 +22,7 @@
/**
* Exception to indicate that there was a IO exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CascadingIOException extends IOException

Modified:
development/main/transit/core/handler/src/main/net/dpml/io/ResourceNotFoundException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/io/ResourceNotFoundException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/io/ResourceNotFoundException.java
Thu Apr 28 19:44:22 2005
@@ -1,16 +1,16 @@
-/*
+/*
* Copyright 2004 Apache Software Foundation
* Licensed 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
- *
+ * 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.
*/
@@ -22,7 +22,7 @@
/**
* Exception to indicate that a request resource was not found.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ResourceNotFoundException extends IOException

Modified:
development/main/transit/core/handler/src/main/net/dpml/lang/DefaultInvocationHandler.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/lang/DefaultInvocationHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/lang/DefaultInvocationHandler.java
Thu Apr 28 19:44:22 2005
@@ -26,8 +26,8 @@
/**
* The ConfigurationInvocationHandler class handles the isolation of a
configuration
* implementation behind the Configuration class.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: ApplianceInvocationHandler.java 2106 2005-03-21 18:46:10Z
mcconnell AT dpml.net $
*/
public final class DefaultInvocationHandler
@@ -93,7 +93,7 @@
{
if( e instanceof UndeclaredThrowableException )
{
- Throwable cause =
+ Throwable cause =
((UndeclaredThrowableException)e).getUndeclaredThrowable();
if( cause == null )
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/Environment.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/Environment.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/Environment.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 2004 Apache Software Foundation
*
* Licensed 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
- *
+ * 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.
*/
@@ -29,37 +29,37 @@

/**
- * Encapsulates operating system and shell specific access to environment
+ * Encapsulates operating system and shell specific access to environment
* variables.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Environment extends Properties
{
- /**
- * os.name System property
+ /**
+ * os.name System property
*/
public static final String OSNAME = System.getProperty( "os.name" );

- /**
- * user.name System property
+ /**
+ * user.name System property
*/
public static final String USERNAME = System.getProperty( "user.name" );

- /**
- * the user's platform specific shell executable
+ /**
+ * the user's platform specific shell executable
*/
private static String m_SHELL = null;

- /**
- * the last Env instance created
+ /**
+ * the last Env instance created
*/
private static Environment m_INSTANCE = null;
-
+
/**
* Creates a snapshot of the current shell environment variables for a
user.
- *
+ *
* @throws EnvironmentException if there is an error accessing the
environment
*/
public Environment() throws EnvironmentException
@@ -75,12 +75,12 @@
}

/**
- * Gets a copy of the last Environment instance without parsing the
user's shell
- * environment. Use this method if you do not want to reparse the
- * environment every time an environment variable is accessed. If an
- * environment has not been created yet one is created then cloned
+ * Gets a copy of the last Environment instance without parsing the
user's shell
+ * environment. Use this method if you do not want to reparse the
+ * environment every time an environment variable is accessed. If an
+ * environment has not been created yet one is created then cloned
* and a copy is returned instead of returning null.
- *
+ *
* @return a copy of the last Environment object created
* @throws EnvironmentException if there is an error accessing the
environment
*/
@@ -94,43 +94,43 @@
// return cloned copy so there is no cross interference
return ( Environment ) m_INSTANCE.clone();
}
-
+

/**
* Gets the value of a shell environment variable.
- *
- * @param name the name of variable
+ *
+ * @param name the name of variable
* @return the String representation of an environment variable value
- * @throws EnvironmentException if there is a problem accessing the
environment
+ * @throws EnvironmentException if there is a problem accessing the
environment
*/
public static String getEnvVariable( String name )
throws EnvironmentException
{
String osName = System.getProperty( "os.name" );
-
+
if( isUnix() )
{
Properties properties = getUnixShellVariables();
return properties.getProperty( name );
}
- else if( isWindows() )
+ else if( isWindows() )
{
return getWindowsShellVariable( name );
}
-
- throw new EnvironmentException( name,
+
+ throw new EnvironmentException( name,
"Unrecognized operating system: " + osName );
}

/**
* Checks to see if the operating system is a UNIX variant.
- *
- * @return true of the OS is a UNIX variant, false otherwise
+ *
+ * @return true of the OS is a UNIX variant, false otherwise
*/
public static boolean isUnix()
{
- if( -1 != OSNAME.indexOf( "Linux" )
- || -1 != OSNAME.indexOf( "SunOS" )
+ if( -1 != OSNAME.indexOf( "Linux" )
+ || -1 != OSNAME.indexOf( "SunOS" )
|| -1 != OSNAME.indexOf( "Solaris" )
|| -1 != OSNAME.indexOf( "MPE/iX" )
|| -1 != OSNAME.indexOf( "AIX" )
@@ -142,46 +142,46 @@
{
return true;
}
-
+
return false;
}
-
-
+
+
/**
* Checks to see if the operating system is a Windows variant.
- *
- * @return true of the OS is a Windows variant, false otherwise
+ *
+ * @return true of the OS is a Windows variant, false otherwise
*/
public static boolean isWindows()
{
return ( -1 != OSNAME.indexOf( "Windows" ) );
}
-
+
/**
* Checks to see if the operating system is NetWare.
- *
- * @return true of the OS is NetWare, false otherwise
+ *
+ * @return true of the OS is NetWare, false otherwise
*/
public static boolean isNetWare()
{
return ( -1 != OSNAME.indexOf( "netware" ) );
}
-
+
/**
* Checks to see if the operating system is OpenVMS.
- *
- * @return true of the OS is a NetWare variant, false otherwise
+ *
+ * @return true of the OS is a NetWare variant, false otherwise
*/
public static boolean isOpenVMS()
{
return ( -1 != OSNAME.indexOf( "openvms" ) );
}
-
+
/**
- * Gets all environment variables within a Properties instance where the
- * key is the environment variable name and value is the value of the
+ * Gets all environment variables within a Properties instance where the
+ * key is the environment variable name and value is the value of the
* property.
- *
+ *
* @return the environment variables and values as Properties
* @throws EnvironmentException if os is not recognized
*/
@@ -191,23 +191,23 @@
{
return getUnixShellVariables();
}
-
+
if( isWindows() )
{
return getWindowsShellVariables();
}
-
- throw new EnvironmentException(
+
+ throw new EnvironmentException(
new UnsupportedOperationException( "Environment operations not "
+ "supported on unrecognized operatings system" ) );
}

-
+
/**
* Gets the user's shell executable.
- *
+ *
* @return the shell executable for the user
- * @throws EnvironmentException the there is a problem accessing shell
+ * @throws EnvironmentException the there is a problem accessing shell
* information
*/
public static String getUserShell() throws EnvironmentException
@@ -216,13 +216,13 @@
{
return getMacUserShell();
}
-
+
if( isWindows() )
{
return getWindowsUserShell();
}
-
- throw new EnvironmentException(
+
+ throw new EnvironmentException(
new UnsupportedOperationException( "Environment operations not "
+ "supported on unrecognized operatings system" ) );
}
@@ -234,7 +234,7 @@
/**
* Gets the default login shell used by a mac user.
*
- * @return the Mac user's default shell as referenced by cmd:
+ * @return the Mac user's default shell as referenced by cmd:
* 'nidump passwd /'
* @throws EnvironmentException if os information is not resolvable
*/
@@ -243,7 +243,7 @@
{
Process process = null;
BufferedReader reader = null;
-
+
if( null != m_SHELL )
{
return m_SHELL;
@@ -254,31 +254,31 @@
String entry = null;
String [] args = {"nidump", "passwd", "/"};
process = Runtime.getRuntime().exec( args );
- reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader( process.getInputStream() ) );
-
+
while ( null != ( entry = reader.readLine() ) )
{
// Skip entries other than the one for this username
- if( !entry.startsWith( USERNAME ) )
+ if( !entry.startsWith( USERNAME ) )
{
continue;
}
-
+
// Get the shell part of the passwd entry
int index = entry.lastIndexOf( ':' );

if( index == -1 )
{
- throw new EnvironmentException(
- "passwd database contains malformed user entry for "
+ throw new EnvironmentException(
+ "passwd database contains malformed user entry for "
+ USERNAME );
}
-
+
m_SHELL = entry.substring( index + 1 );
return m_SHELL;
}
-
+
process.waitFor();
reader.close();
}
@@ -292,7 +292,7 @@
{
process.destroy();
}
-
+
try
{
if( null != reader )
@@ -306,12 +306,12 @@
final boolean ignorable = true;
}
}
-
- throw new EnvironmentException( "User " + USERNAME
+
+ throw new EnvironmentException( "User " + USERNAME
+ " is not present in the passwd database" );
}
-
-
+
+
/**
* Adds a set of Windows variables to a set of properties.
* @return the environment properties
@@ -325,36 +325,36 @@

// Read from process here
BufferedReader reader = null;
-
+
// fire up the shell and get echo'd results on stdout
try
{
String [] args = {getUnixEnv()};
process = Runtime.getRuntime().exec( args );
- reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader( process.getInputStream() ) );
-
+
String line = null;
- while ( null != ( line = reader.readLine() ) )
+ while ( null != ( line = reader.readLine() ) )
{
int index = line.indexOf( '=' );
-
+
if( -1 == index )
{
- if( line.length() != 0 )
+ if( line.length() != 0 )
{
- System.err.println(
+ System.err.println(
"Skipping line - could not find '=' in"
+ " line: '" + line + "'" );
}
continue;
}
-
+
String name = line.substring( 0, index );
String value = line.substring( index + 1, line.length() );
properties.setProperty( name, value );
}
-
+
process.waitFor();
reader.close();
}
@@ -365,7 +365,7 @@
finally
{
process.destroy();
-
+
try
{
if( null != reader )
@@ -379,54 +379,54 @@
final boolean ignorable = true;
}
}
-
+
// Check that we exited normally before returning an invalid output
if( 0 != process.exitValue() )
{
- throw new EnvironmentException(
+ throw new EnvironmentException(
"Environment process failed "
- + " with non-zero exit code of "
+ + " with non-zero exit code of "
+ process.exitValue() );
}
-
+
return properties;
}
-
-
+
+
/**
* Gets the UNIX env executable path.
- *
+ *
* @return the absolute path to the env program
* @throws EnvironmentException if it cannot be found
*/
private static String getUnixEnv() throws EnvironmentException
{
File env = new File( "/bin/env" );
-
+
if( env.exists() && env.canRead() && env.isFile() )
{
return env.getAbsolutePath();
}
-
+
env = new File( "/usr/bin/env" );
if( env.exists() && env.canRead() && env.isFile() )
{
return env.getAbsolutePath();
}
-
- throw new EnvironmentException(
+
+ throw new EnvironmentException(
"Could not find the UNIX env executable" );
}
-
-
+
+
//
------------------------------------------------------------------------
// Private Windows Shell Operations
//
------------------------------------------------------------------------

-
+
/**
* Gets the shell used by the Windows user.
- *
+ *
* @return the shell: cmd.exe or command.com.
*/
private static String getWindowsUserShell()
@@ -435,9 +435,9 @@
{
return m_SHELL;
}
-
- if( -1 != OSNAME.indexOf( "98" )
- || -1 != OSNAME.indexOf( "95" )
+
+ if( -1 != OSNAME.indexOf( "98" )
+ || -1 != OSNAME.indexOf( "95" )
|| -1 != OSNAME.indexOf( "Me" ) )
{
m_SHELL = "command.com";
@@ -447,8 +447,8 @@
m_SHELL = "cmd.exe";
return m_SHELL;
}
-
-
+
+
/**
* Adds a set of Windows variables to a set of properties.
* @return the environment properties
@@ -462,32 +462,32 @@
BufferedReader reader = null;
Properties properties = new Properties();

- // build the command based on the shell used: cmd.exe or command.com
+ // build the command based on the shell used: cmd.exe or command.com
StringBuffer buffer = new StringBuffer( getWindowsUserShell() );
buffer.append( " /C SET" );
-
+
// fire up the shell and get echo'd results on stdout
try
{
process = Runtime.getRuntime().exec( buffer.toString() );
- reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader( process.getInputStream() ) );
- while ( null != ( line = reader.readLine() ) )
+ while ( null != ( line = reader.readLine() ) )
{
int index = line.indexOf( '=' );
-
+
if( -1 == index )
{
System.err.println( "Skipping line - could not find '='
in"
+ " line: '" + line + "'" );
continue;
}
-
+
String name = line.substring( 0, index );
String value = line.substring( index + 1, line.length() );
properties.setProperty( name, value );
}
-
+
process.waitFor();
reader.close();
}
@@ -498,7 +498,7 @@
finally
{
process.destroy();
-
+
try
{
if( null != reader )
@@ -512,20 +512,20 @@
final boolean ignorable = true;
}
}
-
+
if( 0 != process.exitValue() )
{
throw new EnvironmentException( "Environment process failed"
+ " with non-zero exit code of " + process.exitValue() );
}
-
+
return properties;
}

/**
* Gets the value for a windows command shell environment variable.
- *
+ *
* @param name the name of the variable
* @return the value of the variable
* @throws EnvironmentException if there is an error accessing the value
@@ -546,7 +546,7 @@
try
{
process = Runtime.getRuntime().exec( buffer.toString() );
- reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader( process.getInputStream() ) );
value = reader.readLine();
process.waitFor();
@@ -559,7 +559,7 @@
finally
{
process.destroy();
-
+
try
{
if( null != reader )
@@ -573,7 +573,7 @@
final boolean ignorable = true;
}
}
-
+
if( 0 == process.exitValue() )
{
// Handle situations where the env property does not exist.
@@ -581,14 +581,14 @@
{
return null;
}
-
+
return value;
}
-
- throw new EnvironmentException(
- name,
+
+ throw new EnvironmentException(
+ name,
"Environment process failed"
- + " with non-zero exit code of "
+ + " with non-zero exit code of "
+ process.exitValue() );
}
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/EnvironmentException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/EnvironmentException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/EnvironmentException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,83 +21,83 @@
/**
* A simple wrapper exception around exceptions that could occur while
accessing
* environment parameters.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class EnvironmentException extends RuntimeException
{
- /**
- * the environment variable name if available
+ /**
+ * the environment variable name if available
*/
private final String m_variable;

- /**
- * root cause
+ /**
+ * root cause
*/
private final Throwable m_cause;
-
+
/**
- * Creates an exception denoting a failure while attempting to access an
- * environment variable within an operating system and shell specific
+ * Creates an exception denoting a failure while attempting to access an
+ * environment variable within an operating system and shell specific
* environment that is caused by another exception.
- *
+ *
* @param cause the underlying exception that caused the failure
*/
EnvironmentException( final Throwable cause )
{
super();
-
+
m_variable = null;
m_cause = cause;
}

/**
- * Creates an exception denoting a failure while attempting to access an
- * environment variable within an operating system and shell specific
+ * Creates an exception denoting a failure while attempting to access an
+ * environment variable within an operating system and shell specific
* environment.
- *
- * @param message the reason for the access failure
+ *
+ * @param message the reason for the access failure
*/
EnvironmentException( final String message )
{
super( message );
-
+
m_variable = null;
m_cause = null;
}

-
+
/**
- * Creates an exception denoting a failure while attempting to access an
- * environment variable within an operating system and shell specific
+ * Creates an exception denoting a failure while attempting to access an
+ * environment variable within an operating system and shell specific
* environment that is caused by another exception.
- *
+ *
* @param variable the variable whose value was to be accessed
* @param cause the underlying exception that caused the failure
*/
EnvironmentException( final String variable, final Throwable cause )
{
super();
-
+
m_variable = variable;
m_cause = cause;
}

/**
- * Creates an exception denoting a failure while attempting to access an
- * environment variable within an operating system and shell specific
+ * Creates an exception denoting a failure while attempting to access an
+ * environment variable within an operating system and shell specific
* environment.
- *
+ *
* @param variable the variable whose value was to be accessed
- * @param message the reason for the access failure
+ * @param message the reason for the access failure
*/
EnvironmentException( final String variable, final String message )
{
super( message );
-
+
m_variable = variable;
m_cause = null;
}
@@ -105,18 +105,18 @@

/**
* Gets the variable that was to be accessed.
- *
- * @return the value of the variable
+ *
+ * @return the value of the variable
*/
public String getVariable()
{
return m_variable;
}

-
+
/**
* Return the causal exception.
- *
+ *
* @return the exception that caused this exception (possibly null)
*/
public Throwable getCause()
@@ -124,22 +124,22 @@
return m_cause;
}

-
+
/**
* Prepends variable name to the base message.
- *
+ *
* @see java.lang.Throwable#getMessage()
*/
public String getMessage()
{
String base = super.getMessage();
-
+
if ( null == base )
- {
+ {
return "Failed to access " + m_variable + " environment
variable";
}
-
- return "Failed to access " + m_variable
+
+ return "Failed to access " + m_variable
+ " environment variable - " + base;
}
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
==============================================================================
--- development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
(original)
+++ development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
Thu Apr 28 19:44:22 2005
@@ -42,7 +42,7 @@
/**
* CLI hander for the transit package.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class Main

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
Thu Apr 28 19:44:22 2005
@@ -44,7 +44,7 @@
/**
* The initial context of the transit system.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class SecuredTransitContext

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/Adapter.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/Adapter.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/Adapter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -23,11 +23,11 @@

/**
* Utility interface defining a monitor adapter. The contract defines a set
of operations
- * dealing with the notification of debug, info and error messages, together
with
+ * dealing with the notification of debug, info and error messages, together
with
* and operation supporting the construction of a messages dedicated to a
download
* action.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Adapter

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/CacheMonitorAdapter.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/CacheMonitorAdapter.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/CacheMonitorAdapter.java
Thu Apr 28 19:44:22 2005
@@ -28,7 +28,7 @@
/**
* Adapts cache events to logging messages.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see net.dpml.transit.monitors.Monitor
*/
@@ -101,11 +101,11 @@
{
if( getAdapter().isDebugEnabled() )
{
- getAdapter().debug(
- "download failure on ["
- + host + "] for ["
- + artifact
- + "] due to: "
+ getAdapter().debug(
+ "download failure on ["
+ + host + "] for ["
+ + artifact
+ + "] due to: "
+ e.getMessage() );
}
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConnectionMonitorAdapter.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConnectionMonitorAdapter.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConnectionMonitorAdapter.java
Thu Apr 28 19:44:22 2005
@@ -28,7 +28,7 @@
* 
* The NetworkMonitor must be thread safe.
* 
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see net.dpml.transit.monitors.Monitor
*/

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConsoleAdapter.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConsoleAdapter.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ConsoleAdapter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,8 +22,8 @@

/**
* Console montor for download messages.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ConsoleAdapter implements Adapter
@@ -56,7 +56,7 @@
//
------------------------------------------------------------------------

/**
- * Creation of a new console adapter that is used to redirect transit
events
+ * Creation of a new console adapter that is used to redirect transit
events
* the system output stream.
* @param debug if TRUE the adapter should assume debug style reporting
*/
@@ -102,7 +102,7 @@
*/
public void debug( String message )
{
- if( m_debug )
+ if( m_debug )
{
log( message );
}
@@ -236,7 +236,7 @@
int k = q - j;
if( k > offset )
{
- return value.substring( 0, j + offset );
+ return value.substring( 0, j + offset );
}
else
{
@@ -244,8 +244,8 @@
}
}
else
- {
- return value;
+ {
+ return value;
}
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ExceptionHelper.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ExceptionHelper.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/ExceptionHelper.java
Thu Apr 28 19:44:22 2005
@@ -27,7 +27,7 @@

/**
* General utilities supporting the packaging of exception messages.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class ExceptionHelper
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/NetworkMonitorAdapter.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/NetworkMonitorAdapter.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/adapter/NetworkMonitorAdapter.java
Thu Apr 28 19:44:22 2005
@@ -25,7 +25,7 @@
/**
* Adapts network events to logging messages.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class NetworkMonitorAdapter extends AbstractAdapter
implements NetworkMonitor

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/Artifact.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/Artifact.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/Artifact.java
Thu Apr 28 19:44:22 2005
@@ -33,7 +33,7 @@
* An Artifact is a utility class the handles validation of
<code>artifact</code> uri
* specifications.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public final class Artifact

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactAlreadyExistsException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactAlreadyExistsException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactAlreadyExistsException.java
Thu Apr 28 19:44:22 2005
@@ -22,7 +22,7 @@
* Exception to indicate that the Artifact already exists in the cache and
* can therefor not be written to.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ArtifactAlreadyExistsException extends ArtifactException

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactException.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 2004 Niclas Hedhman.
*
* Licensed 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
- *
+ * 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.
*/
@@ -24,7 +24,7 @@
/**
* Exception to indicate that there was an Artifact related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ArtifactException extends TransitException

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactNotFoundException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactNotFoundException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactNotFoundException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004-2005 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* Exception to indicate that ther Artifact could not be located.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ArtifactNotFoundException extends ArtifactException
@@ -50,8 +50,8 @@
super( message );
m_artifact = artifact;
}
-
- /**
+
+ /**
* Returns the Artifact that were attempted to be downloaded.
* @return the subject artifact
*/

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/host/XMLHostsBuilder.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/host/XMLHostsBuilder.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/host/XMLHostsBuilder.java
Thu Apr 28 19:44:22 2005
@@ -35,7 +35,7 @@
* Utility class supporting the translation of an XML based hosts file to a
* set of ResourceHost descriptors.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
final class XMLHostsBuilder

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/CacheMonitor.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/CacheMonitor.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/CacheMonitor.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Niclas Hedhman.
*
* Licensed 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
- *
+ * 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.
*/
@@ -25,12 +25,12 @@
import net.dpml.transit.artifact.Artifact;

/**
- * A monitor of a Transit cache activity.
- *
+ * A monitor of a Transit cache activity.
+ *
* 
* The CacheMonitor must be thread safe.
* 
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see Monitor
*/
@@ -41,40 +41,40 @@
* @param artifact the requested artifact
*/
void resourceRequested( Artifact artifact );
-
+
/**
* Notify the monitor that an artifact has been added to the local cache.
* @param resource the url of the resource added to the local cache
* @param localFile the local file resident in the cache
*/
void addedToLocalCache( URL resource, File localFile );
-
+
/**
* Notify the monitor that an artifact in the local cache has been
updated.
* @param resource the url of the resource updating the local cache
* @param localFile the local file that has been updated
*/
void updatedLocalCache( URL resource, File localFile );
-
+
/**
* Notify the monitor that an artifact has been removed from the local
cache.
* @param resource the url of the resource removed from the local cache
* @param localFile the local file removed from the cache
*/
void removedFromLocalCache( URL resource, File localFile );
-
+
/**
* Notify the monitor of a failed download attempt relative to an
identified host.
* @param host the host raising the fail status
* @param artifact the requested artifact
* @param cause the exception causing the failure
*/
- void failedDownloadFromHost( String host, Artifact artifact, Exception
cause );
-
+ void failedDownloadFromHost( String host, Artifact artifact, Exception
cause );
+
/**
* Notify the monitor of a failed download attempt.
* @param artifact the requested artifact
*/
- void failedDownload( Artifact artifact );
+ void failedDownload( Artifact artifact );

-}
+}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/ConnectionMonitor.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/ConnectionMonitor.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/ConnectionMonitor.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 2004 Niclas Hedhman.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,12 +22,12 @@
import java.net.URL;

/**
- * A monitor of a network activity or activities.
- *
+ * A monitor of a network activity or activities.
+ *
* 
* The NetworkMonitor must be thread safe.
* 
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see Monitor
*/
@@ -38,17 +38,17 @@
* @param url the url on which the open connection was issued
*/
void connectionOpened( URL url );
-
+
/**
* Notify the monitor that a connection was started.
* @param url the target connection
*/
void connectStarted( URL url );
-
-
+
+
/**
* Notify the monitor that a connection was completed.
* @param url the target connection
*/
void connectCompleted( URL url );
-}
+}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/NetworkMonitor.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/NetworkMonitor.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/monitors/NetworkMonitor.java
Thu Apr 28 19:44:22 2005
@@ -24,7 +24,7 @@
/**
* A monitor of a download activity or activities.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
* @see Monitor
*/

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Plugin.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Plugin.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Plugin.java
Thu Apr 28 19:44:22 2005
@@ -25,7 +25,7 @@
* A Plugin class contains immutable data about a plugin based on a
descriptor resolved
* from a 'plugin' artifact.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Plugin

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
Thu Apr 28 19:44:22 2005
@@ -25,7 +25,7 @@
/**
* A service that provides support for the establishment of classloaders and
plugin
* instances based on plugin descriptor describing a classloader chain.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public interface Repository

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/RepositoryException.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/RepositoryException.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/RepositoryException.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 2004 Niclas Hedhman.
*
* Licensed 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
- *
+ * 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.
*/
@@ -24,7 +24,7 @@
/**
* Exception to indicate that there was a repository related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class RepositoryException extends IOException

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardClassLoader.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardClassLoader.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardClassLoader.java
Thu Apr 28 19:44:22 2005
@@ -25,7 +25,7 @@
/**
* A named classloader.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
public class StandardClassLoader extends URLClassLoader

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
Thu Apr 28 19:44:22 2005
@@ -42,7 +42,7 @@
* Utility class supporting downloading of resources based on
* artifact references.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StandardLoader
@@ -652,7 +652,7 @@
// java.io.NotSerializableException: java.io.BufferedInputStream
//

- InputStream input = url.openConnection().getInputStream();
+ InputStream input = url.openConnection().getInputStream();
props.load( input );
return props;
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/util/Dictionary.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/util/Dictionary.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/util/Dictionary.java
Thu Apr 28 19:44:22 2005
@@ -27,7 +27,7 @@
/**
* The dictionary class is a read-only map of keyed values.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Dictionary implements Map

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/util/ElementHelper.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/util/ElementHelper.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/util/ElementHelper.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen McConnell
*
* Licensed 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
- *
+ * 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.
*/
@@ -34,8 +34,8 @@

/**
* Utility class supporting the XL document parsing.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
public final class ElementHelper
@@ -155,7 +155,7 @@
}
else
{
- value = node.getNodeValue();
+ value = node.getNodeValue();
}
return normalize( value );
}
@@ -205,7 +205,7 @@
{
return normalize( value, System.getProperties() );
}
-
+
/**
* Parse the value for any property tokens relative to the supplied
properties.
* @param value the value to parse

Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/repository/PropertiesPluginTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/repository/PropertiesPluginTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/repository/PropertiesPluginTestCase.java
Thu Apr 28 19:44:22 2005
@@ -29,7 +29,7 @@
import net.dpml.transit.artifact.Artifact;

/**
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class PropertiesPluginTestCase extends TestCase

Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
Thu Apr 28 19:44:22 2005
@@ -26,7 +26,7 @@
/**
* Create of a new Artifact test case.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ArtifactTestCase extends TestCase

Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/test/OfflineTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/test/OfflineTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/test/OfflineTestCase.java
Thu Apr 28 19:44:22 2005
@@ -33,7 +33,7 @@
/**
* URL Handler TestCase for Offline operations.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class OfflineTestCase extends TestCase

Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/test/OnlineTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/test/OnlineTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/test/OnlineTestCase.java
Thu Apr 28 19:44:22 2005
@@ -31,7 +31,7 @@
/**
* URL Handler TestCase for Offline operations.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class OnlineTestCase extends TestCase

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/AntAdapter.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/AntAdapter.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/AntAdapter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004-2005 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -28,8 +28,8 @@

/**
* A ant montor for download messages.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: AntMonitor.java 183 2004-10-23 16:53:31Z niclas $
*/
class AntAdapter implements Adapter

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/GetTask.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/GetTask.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/GetTask.java
Thu Apr 28 19:44:22 2005
@@ -31,7 +31,7 @@
* The get task handles the retrival of a rresource and the binding of the
resource filename
* to a project property.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
public class GetTask extends org.apache.tools.ant.Task
@@ -128,9 +128,9 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Unexpected error while attempting to resolve artifact uri ["
- + m_uri
+ + m_uri
+ "]";
throw new BuildException( error, e, getLocation() );
}

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/ImportArtifactTask.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/ImportArtifactTask.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/ImportArtifactTask.java
Thu Apr 28 19:44:22 2005
@@ -34,7 +34,7 @@
* Ant task that provides support for the import of build file templates
* via an artifact url.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class ImportArtifactTask extends ImportTask implements Monitor
{
@@ -55,7 +55,7 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Internal error while initializing Transit";
throw new BuildException( error, e );
}
@@ -78,7 +78,7 @@
/**
* set the artifact to import.
* @param uri the artifact to import into the build file
- * @exception BuildException if an error occurs while attempting to
+ * @exception BuildException if an error occurs while attempting to
* resolve the artifact uri
*/
public void setUri( String uri ) throws BuildException
@@ -91,9 +91,9 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Could not import the resource from the uri ["
- + uri
+ + uri
+ "]";
throw new BuildException( error, e );
}

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MainTask.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MainTask.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MainTask.java
Thu Apr 28 19:44:22 2005
@@ -38,13 +38,13 @@
import net.dpml.transit.monitors.Monitor;

/**
- * Task that initializes the Transit sub-system during which a transit
+ * Task that initializes the Transit sub-system during which a transit
* is assigned to the current project. In addition the initization
procedures
- * establishes a set of ant properties enabling convenient script based
access
+ * establishes a set of ant properties enabling convenient script based
access
* to DPML dirctories.
*
* <pre>
- <project name="example"
+ <project name="example"
xmlns:transit="antlib:net.dpml.transit">
<transit:init/>
<echo message="Home: ${dpml.home}"/>
@@ -62,9 +62,9 @@
[echo] Docs: C:\system\dpml\dist
* </pre>
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public class MainTask extends Task
+public class MainTask extends Task
{
//
------------------------------------------------------------------------
// static
@@ -83,7 +83,7 @@
* List of plugin declarations.
*/
private List m_mappings = new ArrayList();
-
+
//
------------------------------------------------------------------------
// Task
//
------------------------------------------------------------------------
@@ -167,16 +167,16 @@
{
Transit instance = Transit.getInstance();
Adapter adapter = new AntAdapter( this );
- instance.getRepositoryMonitorRouter().addMonitor(
+ instance.getRepositoryMonitorRouter().addMonitor(
new RepositoryMonitorAdapter( adapter ) );
- instance.getCacheMonitorRouter().addMonitor(
+ instance.getCacheMonitorRouter().addMonitor(
new CacheMonitorAdapter( adapter ) );
- instance.getNetworkMonitorRouter().addMonitor(
+ instance.getNetworkMonitorRouter().addMonitor(
new NetworkMonitorAdapter( adapter ) );
}
catch( TransitException e )
{
- final String error =
+ final String error =
"Failed to initialize Transit.";
throw new BuildException( error, e );
}
@@ -185,7 +185,7 @@
/**
* Update a property. If the property is already defined, the
implementation
* checks if the current value is the same as the supplied value and if
not the
- * property value is updated. If not property exists for the given key a
new
+ * property value is updated. If not property exists for the given key a
new
* property will be created.
*
* @param project the ant project

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MapDataType.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MapDataType.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/MapDataType.java
Thu Apr 28 19:44:22 2005
@@ -23,7 +23,7 @@
/**
* Utility class that declares a map beterrn a urn and a plugin uri.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class MapDataType
{

Modified:
development/main/transit/core/tools/src/main/net/dpml/transit/tools/PluginTask.java
==============================================================================
---
development/main/transit/core/tools/src/main/net/dpml/transit/tools/PluginTask.java
(original)
+++
development/main/transit/core/tools/src/main/net/dpml/transit/tools/PluginTask.java
Thu Apr 28 19:44:22 2005
@@ -47,7 +47,7 @@
* The plugin task handles the establishment of ant tasks, listeners, and
antlibs derived
* from a classloader established by the transit sub-system.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
public class PluginTask extends org.apache.tools.ant.Task
@@ -555,7 +555,7 @@
}
catch( TransitException e )
{
- final String error =
+ final String error =
"Internal error while attemting to resolve Transit
repository.";
throw new BuildException( error, e, getLocation() );
}

Modified:
development/main/transit/util/cli/src/main/net/dpml/cli/ArgumentHandler.java
==============================================================================
---
development/main/transit/util/cli/src/main/net/dpml/cli/ArgumentHandler.java
(original)
+++
development/main/transit/util/cli/src/main/net/dpml/cli/ArgumentHandler.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -29,11 +29,11 @@
/**
* Command line parser that handles the establishment of metro cli options
* and separation of supplimentary parameters.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
-public class ArgumentHandler
+public class ArgumentHandler
{
/**
* The complete arguments.
@@ -52,7 +52,7 @@
/**
* Split the arguments into a pair based on the supplied options arugment.
* @param options the options argument
- * @return a pair instance holding the selection of arguments based on
the
+ * @return a pair instance holding the selection of arguments based on the
* supplied options and the remaining argument as a separate sequence
* @exception ParseException is an error occurs
*/
@@ -130,7 +130,7 @@
* @param arguments the list arguments
* @param local the local list
* @exception ParseException is an error occurs
- */
+ */
private void processOption( Option option, List arguments, List local )
throws ParseException
{
@@ -181,12 +181,12 @@
{
if( arg.startsWith( "-" ) )
{
- final String error =
+ final String error =
"Commandline option ["
+ option.getOpt()
- + "] contains a missing argument (expected "
+ + "] contains a missing argument (expected "
+ ( size - 1 )
- + " but found "
+ + " but found "
+ i
+ ").";
throw new MissingArgumentException( error );

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/Criteria.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/Criteria.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/Criteria.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,13 +22,13 @@

/**
* The Criteria class is a type-safe map that is backed by a set of Parameter
- * objects that define a default value and type transformation semantics. A
+ * objects that define a default value and type transformation semantics. A
* criteria instance is normally used as a parameterizable instance that is
supplied
- * by a factory to a client, following which the client modifies the map (in
accordance
- * with type constraints), leading to the supply of the map as the argument
in the
+ * by a factory to a client, following which the client modifies the map (in
accordance
+ * with type constraints), leading to the supply of the map as the argument
in the
* creation of a new instance.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Criteria extends HashMap
@@ -72,11 +72,11 @@
* @exception CriteriaRuntimeException if the supplied value fails
* the validation test for its associated parameter
*/
- public Object put( final Object key, final Object value ) throws
CriteriaRuntimeException
+ public Object put( final Object key, final Object value ) throws
CriteriaRuntimeException
{
if( !( key instanceof String ) )
{
- final String error =
+ final String error =
"Invalid key: " + key;
throw new IllegalArgumentException( error );
}
@@ -101,8 +101,8 @@
}
else
{
- final String error =
- "Resolved value: " + v
+ final String error =
+ "Resolved value: " + v
+ " does not implement the parameter type: "
+ p.getParameterClass();
throw new IllegalArgumentException( error );
@@ -110,7 +110,7 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Unable to assign a value to the key: " + key;
throw new CriteriaRuntimeException( error, e );
}
@@ -184,7 +184,7 @@
}
}

- final String error =
+ final String error =
"Unknown key: [" + key + "].";
throw new IllegalArgumentException( error );
}

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaException.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaException.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a criteria related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CriteriaException extends Exception

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaRuntimeException.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaRuntimeException.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/CriteriaRuntimeException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* Exception to indicate that there was a repository related error.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class CriteriaRuntimeException extends RuntimeException

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/PackedParameter.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/PackedParameter.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/PackedParameter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,10 +22,10 @@
import java.util.StringTokenizer;

/**
- * A parameter descriptor that supports transformation of a
+ * A parameter descriptor that supports transformation of a
* a string to a string array based on a supplied token.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class PackedParameter extends Parameter
@@ -49,8 +49,8 @@
* @param delimiter the delimiter character
* @param defaults the default string array
*/
- public PackedParameter(
- final String key, final String delimiter, String[] defaults )
+ public PackedParameter(
+ final String key, final String delimiter, String[] defaults )
{
super( key, String[].class, defaults );
m_delimiter = delimiter;
@@ -62,7 +62,7 @@
* @return the object value
* @exception CriteriaException if an error occurs
*/
- public Object resolve( Object value )
+ public Object resolve( Object value )
throws CriteriaException
{
if( value == null )
@@ -80,9 +80,9 @@
}
else
{
- final String error =
- "Don't know how to transform an instance of ["
- + value.getClass().getName()
+ final String error =
+ "Don't know how to transform an instance of ["
+ + value.getClass().getName()
+ " to a String[].";
throw new CriteriaException( error );
}
@@ -102,7 +102,7 @@
}

ArrayList list = new ArrayList();
- StringTokenizer tokenizer =
+ StringTokenizer tokenizer =
new StringTokenizer( value, delimiter );
while( tokenizer.hasMoreTokens() )
{

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/Parameter.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/Parameter.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/Parameter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,10 +22,10 @@
import java.io.Serializable;

/**
- * A parameter is an immutable class that contains a description
+ * A parameter is an immutable class that contains a description
* of an allowable parameter within a crieria instance.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class Parameter implements Serializable
@@ -35,7 +35,7 @@
//--------------------------------------------------------------

/**
- * Return the set of keys corresponding to the supplied set of
+ * Return the set of keys corresponding to the supplied set of
* parameters.
* @param params the parameter sequence
* @return the corresponding keys
@@ -125,7 +125,7 @@
}
catch( CriteriaException e )
{
- final String error =
+ final String error =
"Illegal attempt to assign a default value that is not
assignable from the class: "
+ type.getName();
throw new IllegalArgumentException( error );
@@ -214,22 +214,22 @@
return value;
}
else
- {
+ {
Constructor constructor = null;
try
{
- constructor =
- type.getConstructor(
+ constructor =
+ type.getConstructor(
new Class[]{value.getClass()} );
}
catch( NoSuchMethodException nsme )
{
final String error =
- "Value of class: ["
- + value.getClass().getName()
- + "] supplied for key ["
- + getKey()
- + "] is not an instance of type: ["
+ "Value of class: ["
+ + value.getClass().getName()
+ + "] supplied for key ["
+ + getKey()
+ + "] is not an instance of type: ["
+ type.getName()
+ "].";
throw new CriteriaException( error );
@@ -237,17 +237,17 @@

try
{
- return constructor.newInstance(
+ return constructor.newInstance(
new Object[]{value} );
}
catch( Throwable e )
{
final String error =
- "Value of class: ["
- + value.getClass().getName()
- + "] supplied for key ["
- + getKey()
- + "] is not an instance of or was not resolvable to the
type: ["
+ "Value of class: ["
+ + value.getClass().getName()
+ + "] supplied for key ["
+ + getKey()
+ + "] is not an instance of or was not resolvable to the
type: ["
+ type.getName()
+ "].";
throw new CriteriaException( error, e );

Modified:
development/main/transit/util/criteria/src/main/net/dpml/criteria/URLParameter.java
==============================================================================
---
development/main/transit/util/criteria/src/main/net/dpml/criteria/URLParameter.java
(original)
+++
development/main/transit/util/criteria/src/main/net/dpml/criteria/URLParameter.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,10 +22,10 @@
import java.net.URL;

/**
- * A parameter descriptor that supports transformation of a
+ * A parameter descriptor that supports transformation of a
* a string url to an URL instance.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class URLParameter extends Parameter
@@ -38,7 +38,7 @@
* Transform a string to a string array.
* @param key the parameter key
*/
- public URLParameter( final String key )
+ public URLParameter( final String key )
{
super( key, URL.class );
}
@@ -49,7 +49,7 @@
* @return the resolved value
* @exception CriteriaException if an error occurs
*/
- public Object resolve( Object value )
+ public Object resolve( Object value )
throws CriteriaException
{
if( value == null )
@@ -69,9 +69,9 @@
File file = (File) value;
if( !file.exists() )
{
- final String error =
- "Parameter argument ["
- + getKey()
+ final String error =
+ "Parameter argument ["
+ + getKey()
+ "] references an unknown file location ["
+ file.toString()
+ "].";
@@ -85,9 +85,9 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Unexpected error while attempting to convert the file
["
- + file.toString()
+ + file.toString()
+ " to a url.";
throw new CriteriaException( error, e );
}

Modified:
development/main/transit/util/exception/src/main/net/dpml/exception/ExceptionHelper.java
==============================================================================
---
development/main/transit/util/exception/src/main/net/dpml/exception/ExceptionHelper.java
(original)
+++
development/main/transit/util/exception/src/main/net/dpml/exception/ExceptionHelper.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -25,14 +25,14 @@

/**
* General utilities supporting the packaging of exception messages.
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class ExceptionHelper
{
/**
* Line separator character.
*/
- private static final String LINE_SEPARATOR =
+ private static final String LINE_SEPARATOR =
System.getProperty( "line.separator" );

/**
@@ -120,7 +120,7 @@
* @param stack TRUE to generate a stack trace
* @return String the formatting string
*/
- public static String packException(
+ public static String packException(
final String message, final Throwable e, boolean stack )
{
StringBuffer buffer = new StringBuffer();
@@ -137,7 +137,7 @@
* @param stack TRUE to generate a stack trace
* @return String the formatting string
*/
- public static String packException(
+ public static String packException(
final String message, final Throwable[] e, boolean stack )
{
final String lead = COMPOSITE + "(" + e.length + " entries) ";
@@ -163,7 +163,7 @@
* @param e the exception
* @param stack TRUE to generate a stack trace
*/
- private static void packException(
+ private static void packException(
final StringBuffer buffer, int j, final String message, final
Throwable e, boolean stack )
{
if( e instanceof Error )
@@ -185,7 +185,7 @@
buffer.append( "\n" );
}

- if( e == null )
+ if( e == null )
{
return;
}
@@ -266,7 +266,7 @@

try
{
- Method method =
+ Method method =
exception.getClass().getMethod( "getCause", new Class[0] );
return (Throwable) method.invoke( exception, new Object[0] );
}
@@ -290,10 +290,10 @@

try
{
- Method method =
+ Method method =
exception.getClass().getMethod( "getLocation", new Class[0] );
Object location = method.invoke( exception, new Object[0] );
-System.out.println( "## LOC CLASS: " + location.getClass().getName() );
+System.out.println( "## LOC CLASS: " + location.getClass().getName() );
return "[" + location.toString() + "]";
}
catch( Throwable e )
@@ -359,7 +359,7 @@
* Get a line of '-' characters with padded offset.
* @param lead the leading characters
* @param count the number of characters to fill
- * @return the filled out line
+ * @return the filled out line
*/
private static String getLine( String lead, int count )
{

Modified:
development/main/transit/util/exception/src/test/net/dpml/exception/ExceptionHelperTest.java
==============================================================================
---
development/main/transit/util/exception/src/test/net/dpml/exception/ExceptionHelperTest.java
(original)
+++
development/main/transit/util/exception/src/test/net/dpml/exception/ExceptionHelperTest.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -22,12 +22,12 @@

/**
* ExceptionHelper tests.
- *
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class ExceptionHelperTest extends TestCase
-{
+{
/**
* Constructor for ExceptionHelperTest.
* @param name
@@ -58,9 +58,9 @@
{
e2 = e;
}
- final String message =
- ExceptionHelper.packException(
- "Composite exception report",
+ final String message =
+ ExceptionHelper.packException(
+ "Composite exception report",
new Throwable[]{ e1, e2 }, false );
assertNotNull( message );
//System.out.println( message );
@@ -75,7 +75,7 @@
}
catch( Throwable e )
{
- final String message =
+ final String message =
ExceptionHelper.packException( "An error occured.", e );
//System.out.println( message );
assertNotNull( message );
@@ -91,7 +91,7 @@
}
catch( Throwable e )
{
- final String message =
+ final String message =
ExceptionHelper.packException( e, true );
assertNotNull( message );
}
@@ -106,7 +106,7 @@
}
catch( Throwable e )
{
- final String message =
+ final String message =
ExceptionHelper.packException( "An error occured.", e, true );
assertNotNull( message );
}
@@ -142,8 +142,8 @@

private void causeSomeError()
{
- final String error =
+ final String error =
"Raising exception because that's what I'm programmed to do.";
throw new StandardError( error );
- }
+ }
}

Modified:
development/main/transit/util/exception/src/test/net/dpml/exception/StandardError.java
==============================================================================
---
development/main/transit/util/exception/src/test/net/dpml/exception/StandardError.java
(original)
+++
development/main/transit/util/exception/src/test/net/dpml/exception/StandardError.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* Error containing a causal exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StandardError

Modified:
development/main/transit/util/exception/src/test/net/dpml/exception/StandardException.java
==============================================================================
---
development/main/transit/util/exception/src/test/net/dpml/exception/StandardException.java
(original)
+++
development/main/transit/util/exception/src/test/net/dpml/exception/StandardException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* Exception containing a causal exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StandardException

Modified:
development/main/transit/util/exception/src/test/net/dpml/exception/StandardRuntimeException.java
==============================================================================
---
development/main/transit/util/exception/src/test/net/dpml/exception/StandardRuntimeException.java
(original)
+++
development/main/transit/util/exception/src/test/net/dpml/exception/StandardRuntimeException.java
Thu Apr 28 19:44:22 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed 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
- *
+ * 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.
*/
@@ -21,7 +21,7 @@
/**
* RuntimeException containing a causal exception.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id$
*/
public class StandardRuntimeException

Modified:
development/main/transit/util/i18n/src/main/net/dpml/i18n/ResourceManager.java
==============================================================================
---
development/main/transit/util/i18n/src/main/net/dpml/i18n/ResourceManager.java
(original)
+++
development/main/transit/util/i18n/src/main/net/dpml/i18n/ResourceManager.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed 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
- *
+ * 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.
*/
@@ -25,7 +25,7 @@
/**
* Manager for resources.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public final class ResourceManager
{

Modified:
development/main/transit/util/i18n/src/main/net/dpml/i18n/Resources.java
==============================================================================
--- development/main/transit/util/i18n/src/main/net/dpml/i18n/Resources.java
(original)
+++ development/main/transit/util/i18n/src/main/net/dpml/i18n/Resources.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed 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
- *
+ * 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.
*/
@@ -33,7 +33,7 @@
*
* Reworked to mirror behaviour of StringManager from Tomcat (format() to
getString()).
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class Resources
{

Modified:
development/main/transit/util/i18n/src/test/net/dpml/i18n/test/ResourceManagerTestCase.java
==============================================================================
---
development/main/transit/util/i18n/src/test/net/dpml/i18n/test/ResourceManagerTestCase.java
(original)
+++
development/main/transit/util/i18n/src/test/net/dpml/i18n/test/ResourceManagerTestCase.java
Thu Apr 28 19:44:22 2005
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed 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
- *
+ * 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.
*/
@@ -28,7 +28,7 @@
/**
* TestCase for ResourceManager.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class ResourceManagerTestCase
extends TestCase

svn commit: r2445 - in development/main/transit: core/handler/src/main/net/dpml/io core/handler/src/main/net/dpml/lang core/handler/src/main/net/dpml/transit core/handler/src/main/net/dpml/transit/adapter core/handler/src/main/net/dpml/transit/artifact core/handler/src/main/net/dpml/transit/host core/handler/src/main/net/dpml/transit/monitors core/handler/src/main/net/dpml/transit/repository core/handler/src/main/net/dpml/transit/util core/handler/src/test/net/dpml/transit/repository core/handler/src/test/net/dpml/transit/test core/tools/src/main/net/dpml/transit/tools util/cli/src/main/net/dpml/cli util/criteria/src/main/net/dpml/criteria util/exception/src/main/net/dpml/exception util/exception/src/test/net/dpml/exception util/i18n/src/main/net/dpml/i18n util/i18n/src/test/net/dpml/i18n/test, niclas, 04/28/2005