You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/04/18 15:30:07 UTC
cvs commit: jakarta-avalon/src/java/org/apache/avalon/camelot AbstractContainer.java AbstractDeployer.java CamelotUtil.java Container.java DefaultFactory.java DefaultLoader.java DefaultLocator.java Deployer.java DeployerUtil.java Entry.java Factory.java Info.java Loader.java Locator.java Registry.java
donaldp 01/04/18 06:30:07
Modified: src/java/org/apache/avalon/camelot AbstractContainer.java
AbstractDeployer.java CamelotUtil.java
Container.java DefaultFactory.java
DefaultLoader.java DefaultLocator.java
Deployer.java DeployerUtil.java Entry.java
Factory.java Info.java Loader.java Locator.java
Registry.java
Log:
Update to new package arrangement
Revision Changes Path
1.3 +2 -2 jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractContainer.java 2001/04/15 00:26:18 1.2
+++ AbstractContainer.java 2001/04/18 13:29:49 1.3
@@ -9,8 +9,8 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This contains it during execution and may provide certain
1.3 +3 -3 jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractDeployer.java
Index: AbstractDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/AbstractDeployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDeployer.java 2001/04/17 03:07:25 1.2
+++ AbstractDeployer.java 2001/04/18 13:29:50 1.3
@@ -14,9 +14,9 @@
import java.io.OutputStream;
import java.net.URL;
import java.util.HashMap;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentNotFoundException;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
import org.apache.excalibur.io.FileUtil;
import org.apache.log.Logger;
1.5 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/CamelotUtil.java
Index: CamelotUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/CamelotUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CamelotUtil.java 2001/04/17 03:07:26 1.4
+++ CamelotUtil.java 2001/04/18 13:29:51 1.5
@@ -12,7 +12,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Iterator;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.excalibur.io.DirectoryFileFilter;
import org.apache.excalibur.io.ExtensionFileFilter;
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Container.java
Index: Container.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Container.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Container.java 2001/04/15 00:26:19 1.2
+++ Container.java 2001/04/18 13:29:52 1.3
@@ -8,7 +8,7 @@
package org.apache.avalon.camelot;
import java.util.Iterator;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This contains it during execution and may provide certain
1.3 +17 -17 jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultFactory.java 2001/04/15 00:26:19 1.2
+++ DefaultFactory.java 2001/04/18 13:29:52 1.3
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import java.net.URL;
import java.util.HashMap;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.logger.AbstractLoggable;
/**
- * This is the component that creates the components.
+ * This is the component that creates the components.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
@@ -36,7 +36,7 @@
* @return the component
* @exception FactoryException if an error occurs
*/
- public Object create( final Locator locator )
+ public Object create( final Locator locator )
throws FactoryException
{
final Loader loader = getLoaderFor( locator.getLocation() );
@@ -44,7 +44,7 @@
try { return loader.load( locator.getName() ); }
catch( final Exception e )
{
- throw new FactoryException( "Unable to create " + locator.getName() +
+ throw new FactoryException( "Unable to create " + locator.getName() +
" from " + locator.getLocation(), e );
}
}
@@ -53,13 +53,13 @@
throws FactoryException
{
final Object object = create( locator );
-
+
if( !clazz.isInstance( object ) )
{
throw new FactoryException( "Created object of type " + object.getClass().getName() +
" not compatable with type " + clazz.getName() );
}
-
+
return object;
}
@@ -67,7 +67,7 @@
{
final String location = url.toString();
LoaderEntry loader = (LoaderEntry)m_loaders.get( location );
-
+
if( null == loader )
{
getLogger().info( "Creating ClassLoader for " + location );
@@ -75,14 +75,14 @@
loader.m_loader = setupLoader( url );
loader.m_lastModified = System.currentTimeMillis();
-
+
m_loaders.put( location, loader );
}
else
{
//TODO: Check it up to date and reload if necessary
}
-
+
return loader.m_loader;
}
@@ -94,7 +94,7 @@
return loader;
}
-
+
/**
* Create a new loader.
* Put in another method so that it can be overridden.
1.5 +2 -2 jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultLoader.java 2001/04/15 00:26:19 1.4
+++ DefaultLoader.java 2001/04/18 13:29:53 1.5
@@ -9,7 +9,7 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.avalon.util.StringUtil;
+import org.apache.avalon.ExceptionUtil;
/**
* Class used to load resources from a source.
@@ -97,7 +97,7 @@
catch( final Throwable t )
{
throw new FactoryException( "Failed to get class " + classname +
- " due to " + StringUtil.printStackTrace( t, 5, true ),
+ " due to " + ExceptionUtil.printStackTrace( t, 5, true ),
t );
}
}
1.2 +9 -9 jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLocator.java
Index: DefaultLocator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DefaultLocator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLocator.java 2001/02/24 04:00:36 1.1
+++ DefaultLocator.java 2001/04/18 13:29:53 1.2
@@ -1,18 +1,18 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
*/
package org.apache.avalon.camelot;
import java.net.URL;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This contains information required to locate a component.
- *
+ *
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public class DefaultLocator
@@ -26,7 +26,7 @@
m_name = name;
m_location = location;
}
-
+
/**
* Retrieve "name" of component type.
* The "name" usually indicates the classname.
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Deployer.java
Index: Deployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Deployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Deployer.java 2001/04/15 00:26:20 1.2
+++ Deployer.java 2001/04/18 13:29:53 1.3
@@ -8,7 +8,7 @@
package org.apache.avalon.camelot;
import java.net.URL;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* A Deployer is responsible for taking a URL (ie a jar/war/ear) and deploying
1.3 +3 -5 jakarta-avalon/src/java/org/apache/avalon/camelot/DeployerUtil.java
Index: DeployerUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/DeployerUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployerUtil.java 2001/04/15 00:26:20 1.2
+++ DeployerUtil.java 2001/04/18 13:29:54 1.3
@@ -18,11 +18,9 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentNotAccessibleException;
-import org.apache.avalon.ComponentNotFoundException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.DefaultConfigurationBuilder;
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Entry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Entry.java 2001/04/15 00:26:20 1.2
+++ Entry.java 2001/04/18 13:29:55 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* Contains information about a particular instance of contained component.
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Factory.java
Index: Factory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Factory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Factory.java 2001/04/15 00:26:20 1.2
+++ Factory.java 2001/04/18 13:29:55 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This is the component that creates the components.
1.4 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Info.java
Index: Info.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Info.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Info.java 2001/04/15 00:26:21 1.3
+++ Info.java 2001/04/18 13:29:56 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This contains information relating to a component.
1.4 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Loader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Loader.java 2001/04/15 00:26:21 1.3
+++ Loader.java 2001/04/18 13:29:57 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.camelot;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* Class used to load resources from a source.
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Locator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Locator.java 2001/04/15 00:26:21 1.2
+++ Locator.java 2001/04/18 13:29:57 1.3
@@ -8,7 +8,7 @@
package org.apache.avalon.camelot;
import java.net.URL;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* This contains information required to locate a component.
1.4 +1 -1 jakarta-avalon/src/java/org/apache/avalon/camelot/Registry.java
Index: Registry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/camelot/Registry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Registry.java 2001/04/15 00:26:21 1.3
+++ Registry.java 2001/04/18 13:29:58 1.4
@@ -8,7 +8,7 @@
package org.apache.avalon.camelot;
import java.util.Iterator;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
* Represents a database of Infos.
---------------------------------------------------------------------
To unsubscribe, e-mail: avalon-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: avalon-dev-help@jakarta.apache.org