You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/07 21:34:43 UTC
cvs commit: avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util ExceptionHelper.java
mcconnell 2004/01/07 12:34:42
Modified: merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: Ver_3_4 AbstractBlock.java
DefaultAppliance.java DefaultBlockContext.java
DefaultServiceManager.java Deployer.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
Tag: Ver_3_4 RuntimeTestCase.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 Scanner.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
Tag: Ver_3_4 IncludesTestCase.java
TargetsTestCase.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
Tag: Ver_3_4 DefaultKernel.java
Removed: merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 ComponentModelFactory.java
merlin/composition/impl/src/java/org/apache/avalon/composition/util
Tag: Ver_3_4 ExceptionHelper.java
Log:
Update sources to use the avalon util ExceptionHelper class in favour of the componention equivalent and some additional housekeeping.
Revision Changes Path
No revision
No revision
1.10.2.5 +2 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- AbstractBlock.java 7 Jan 2004 16:07:17 -0000 1.10.2.4
+++ AbstractBlock.java 7 Jan 2004 20:34:42 -0000 1.10.2.5
@@ -101,7 +101,7 @@
/**
* Create a root containment block.
- * @param services the service context
+ * @param system the system context
* @param model the root containment model
* @return the appliance
*/
1.15.2.3 +1 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- DefaultAppliance.java 7 Jan 2004 12:57:25 -0000 1.15.2.2
+++ DefaultAppliance.java 7 Jan 2004 20:34:42 -0000 1.15.2.3
@@ -62,7 +62,6 @@
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.ApplianceException;
import org.apache.avalon.activation.appliance.AssemblyException;
-import org.apache.avalon.activation.appliance.Composite;
import org.apache.avalon.activation.appliance.Engine;
import org.apache.avalon.activation.lifecycle.ContextualizationHandler;
import org.apache.avalon.activation.lifecycle.Factory;
1.3.2.2 +1 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- DefaultBlockContext.java 7 Jan 2004 12:57:25 -0000 1.3.2.1
+++ DefaultBlockContext.java 7 Jan 2004 20:34:42 -0000 1.3.2.2
@@ -79,7 +79,6 @@
* @param context the service context
* @param engine the engine from which dependent applicance
* instances may be resolved
- * @param repository the parent appliance repository
*/
public DefaultBlockContext(
Logger logger, ContainmentModel model,
1.4.2.2 +4 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
Index: DefaultServiceManager.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- DefaultServiceManager.java 7 Jan 2004 14:50:17 -0000 1.4.2.1
+++ DefaultServiceManager.java 7 Jan 2004 20:34:42 -0000 1.4.2.2
@@ -59,12 +59,13 @@
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Home;
-import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.util.exception.ExceptionHelper;
+
/**
* Default implementation of the framework {@link ServiceManager} interface.
* @author Stephen McConnell <mc...@osm.net>
@@ -219,7 +220,8 @@
{
final String error =
"Internal error while attempting to release object from provider: " + provider;
- final String warning = ExceptionHelper.packException( error, e, true );
+ final String warning =
+ ExceptionHelper.packException( error, e, true );
getLogger().warn( warning );
}
finally
1.2.2.3 +2 -1 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java
Index: Deployer.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- Deployer.java 7 Jan 2004 16:07:17 -0000 1.2.2.2
+++ Deployer.java 7 Jan 2004 20:34:42 -0000 1.2.2.3
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.logger.Logger;
+/**
* Runnable deployment thread that handles the deployment of an
* arbitary number of deployable instances. The deployer maintains a
* list of deployment requests which are queued on a first come first
No revision
No revision
1.3.2.2 +3 -1 avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java
Index: RuntimeTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RuntimeTestCase.java 7 Jan 2004 12:57:26 -0000 1.3.2.1
+++ RuntimeTestCase.java 7 Jan 2004 20:34:42 -0000 1.3.2.2
@@ -3,7 +3,9 @@
package org.apache.avalon.activation.appliance;
import org.apache.avalon.activation.appliance.impl.AbstractBlock;
-import org.apache.avalon.composition.util.ExceptionHelper;
+
+import org.apache.avalon.util.exception.ExceptionHelper;
+
import org.apache.avalon.framework.activity.Disposable;
public class RuntimeTestCase extends AbstractTestCase
No revision
No revision
1.3.2.1 +8 -4 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Scanner.java 28 Oct 2003 20:21:00 -0000 1.3
+++ Scanner.java 7 Jan 2004 20:34:42 -0000 1.3.2.1
@@ -68,19 +68,23 @@
import java.util.zip.ZipEntry;
import org.apache.avalon.composition.model.ModelException;
-import org.apache.avalon.composition.util.ExceptionHelper;
+import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
+import org.apache.avalon.composition.util.StringHelper;
+
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
-import org.apache.avalon.composition.util.StringHelper;
+
import org.apache.avalon.meta.info.Service;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.info.builder.TypeBuilder;
import org.apache.avalon.meta.info.builder.ServiceBuilder;
import org.apache.avalon.meta.info.verifier.TypeVerifier;
+
+import org.apache.avalon.util.exception.ExceptionHelper;
/**
* A repository for services, types and profiles.
No revision
No revision
1.2.2.1 +2 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java
Index: IncludesTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- IncludesTestCase.java 28 Oct 2003 20:21:01 -0000 1.2
+++ IncludesTestCase.java 7 Jan 2004 20:34:42 -0000 1.2.2.1
@@ -4,7 +4,8 @@
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.AbstractTestCase;
-import org.apache.avalon.composition.util.ExceptionHelper;
+
+import org.apache.avalon.util.exception.ExceptionHelper;
public class IncludesTestCase extends AbstractTestCase
{
1.2.2.3 +4 -1 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java
Index: TargetsTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- TargetsTestCase.java 4 Jan 2004 21:29:00 -0000 1.2.2.2
+++ TargetsTestCase.java 7 Jan 2004 20:34:42 -0000 1.2.2.3
@@ -9,10 +9,13 @@
import org.apache.avalon.composition.model.AbstractTestCase;
import org.apache.avalon.composition.data.Targets;
import org.apache.avalon.composition.data.TargetDirective;
-import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.composition.data.builder.XMLTargetsCreator;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
+import org.apache.avalon.util.exception.ExceptionHelper;
+
import org.apache.excalibur.configuration.ConfigurationUtil;
public class TargetsTestCase extends AbstractTestCase
No revision
No revision
1.1.2.3 +2 -4 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DefaultKernel.java 7 Jan 2004 16:07:17 -0000 1.1.2.2
+++ DefaultKernel.java 7 Jan 2004 20:34:42 -0000 1.1.2.3
@@ -62,7 +62,6 @@
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Block;
-import org.apache.avalon.activation.appliance.Composite;
import org.apache.avalon.activation.appliance.impl.AbstractBlock;
import org.apache.avalon.composition.data.TargetDirective;
@@ -136,8 +135,7 @@
* Creation of a new Merlin Kernel.
* @param logger the assigned logging channel
* @param criteria the kernel creation criteria
- * @param system the system block
- * @param mosdel the application model
+ * @param model the application model
* @exception KernelException if a kernel creation error occurs
*/
public DefaultKernel(
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org