Heres a patch that tries to minimize the chance of classloader deadlock due to
dodgy bootstrap classloader. It also optimizes some imports and cleans up
some style issues.
--
Cheers,
Peter Donald
*----------------------------------------------------*
| "Luck is the residue of design" -- Branch Rickey |
*----------------------------------------------------*
? ContainerKitEmbeddor2.java
? dynamic-rmi.html
? mx4j-tools-temp
? patch.txt
? resources.txt
? lib/log4j-1.2.4.jar
Index: src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
retrieving revision 1.23
diff -u -r1.23 BlockEntry.java
--- src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java 25 Jan
2003 15:47:17 -0000 1.23
+++ src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java 3 Feb
+2003 12:31:09 -0000
@@ -7,10 +7,10 @@
*/
package org.apache.avalon.phoenix.components.application;
-import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.framework.info.Attribute;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
/**
Index:
src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.14
diff -u -r1.14 BlockResourceProvider.java
---
src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
25 Jan 2003 15:47:17 -0000 1.14
+++
+src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
+ 3 Feb 2003 12:31:10 -0000
@@ -21,15 +21,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.info.DependencyDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
+import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
Index:
src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.40
diff -u -r1.40 DefaultApplication.java
--- src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
25 Jan 2003 15:47:17 -0000 1.40
+++ src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
+ 3 Feb 2003 12:31:11 -0000
@@ -22,19 +22,15 @@
import org.apache.avalon.phoenix.BlockListener;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ComponentMetaDataConverter;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
+import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationException;
import org.apache.avalon.phoenix.interfaces.ApplicationMBean;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.excalibur.threadcontext.ThreadContext;
/**
Index: src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java,v
retrieving revision 1.9
diff -u -r1.9 DependencyGraph.java
--- src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java
25 Jan 2003 15:47:17 -0000 1.9
+++ src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java
+ 3 Feb 2003 12:31:11 -0000
@@ -8,9 +8,9 @@
package org.apache.avalon.phoenix.components.application;
import java.util.ArrayList;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
import org.apache.avalon.framework.info.DependencyDescriptor;
+import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
+import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
/**
*
Index: src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java,v
retrieving revision 1.4
diff -u -r1.4 ExportHelper.java
--- src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java 25 Jan
2003 15:47:17 -0000 1.4
+++ src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java 3 Feb
+2003 12:31:12 -0000
@@ -7,15 +7,15 @@
*/
package org.apache.avalon.phoenix.components.application;
+import java.util.ArrayList;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.CascadingException;
-import org.apache.avalon.framework.tools.infobuilder.LegacyUtil;
import org.apache.avalon.framework.info.ServiceDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.interfaces.ApplicationContext;
+import org.apache.avalon.framework.tools.infobuilder.LegacyUtil;
import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import java.util.ArrayList;
+import org.apache.avalon.phoenix.interfaces.ApplicationContext;
/**
* Utility class to help with exporting Blocks to management subsystem.
Index:
src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java,v
retrieving revision 1.6
diff -u -r1.6 ListenerResourceProvider.java
---
src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java
26 Jan 2003 23:32:43 -0000 1.6
+++
+src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java
+ 3 Feb 2003 12:31:12 -0000
@@ -17,10 +17,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.interfaces.ApplicationContext;
/**
* The accessor used to access resources for a particular
Index: src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java,v
retrieving revision 1.5
diff -u -r1.5 ListenerSupport.java
--- src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java
25 Jan 2003 15:47:17 -0000 1.5
+++ src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java
+ 3 Feb 2003 12:31:12 -0000
@@ -11,10 +11,10 @@
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockEvent;
import org.apache.avalon.phoenix.BlockListener;
-import org.apache.avalon.phoenix.metainfo.BlockInfo;
import org.apache.avalon.phoenix.components.util.ComponentInfoConverter;
-import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.metadata.SarMetaData;
+import org.apache.avalon.phoenix.metainfo.BlockInfo;
/**
* Manage a set of {@link ApplicationListener} objects and propogate
Index: src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java,v
retrieving revision 1.3
diff -u -r1.3 Assembler.java
--- src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java 26 Jan
2003 23:32:43 -0000 1.3
+++ src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java 3 Feb
+2003 12:31:13 -0000
@@ -8,8 +8,8 @@
package org.apache.avalon.phoenix.components.assembler;
import java.util.ArrayList;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
Index:
src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.50
diff -u -r1.50 DefaultClassLoaderManager.java
---
src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
1 Nov 2002 23:26:56 -0000 1.50
+++
+src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
+ 3 Feb 2003 12:31:14 -0000
@@ -35,8 +35,8 @@
import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
import org.apache.excalibur.loader.metadata.FileSetMetaData;
import org.apache.excalibur.loader.metadata.JoinMetaData;
-import org.apache.excalibur.loader.verifier.ClassLoaderVerifier;
import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
+import org.apache.excalibur.loader.verifier.ClassLoaderVerifier;
import org.apache.excalibur.policy.builder.PolicyBuilder;
import org.apache.excalibur.policy.metadata.PolicyMetaData;
import org.apache.excalibur.policy.reader.PolicyReader;
Index: src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java,v
retrieving revision 1.4
diff -u -r1.4 SarPolicyResolver.java
--- src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java
2 Nov 2002 00:29:27 -0000 1.4
+++ src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java
+ 3 Feb 2003 12:31:14 -0000
@@ -18,8 +18,8 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.avalon.phoenix.BlockContext;
+import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.excalibur.policy.builder.PolicyResolver;
/**
Index:
src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
retrieving revision 1.12
diff -u -r1.12 FileSystemPersistentConfigurationRepository.java
---
src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
16 Nov 2002 13:49:00 -0000 1.12
+++
+src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
+ 3 Feb 2003 12:31:23 -0000
@@ -19,9 +19,9 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
Index: src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.63
diff -u -r1.63 DefaultDeployer.java
--- src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java 25 Jan
2003 15:47:17 -0000 1.63
+++ src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java 3 Feb
+2003 12:31:24 -0000
@@ -34,6 +34,12 @@
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.components.assembler.Assembler;
import org.apache.avalon.phoenix.components.assembler.AssemblyException;
+import org.apache.avalon.phoenix.containerkit.factory.ComponentBundle;
+import org.apache.avalon.phoenix.containerkit.factory.ComponentFactory;
+import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
+import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
+import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.ClassLoaderSet;
@@ -50,12 +56,6 @@
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
import org.apache.avalon.phoenix.tools.verifier.VerifyException;
-import org.apache.avalon.phoenix.containerkit.factory.ComponentBundle;
-import org.apache.avalon.phoenix.containerkit.factory.ComponentFactory;
-import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
/**
* Deploy .sar files into a kernel using this class.
Index:
src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java,v
retrieving revision 1.2
diff -u -r1.2 PhoenixComponentFactory.java
---
src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java 25
Jan 2003 15:47:17 -0000 1.2
+++
+src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java 3
+Feb 2003 12:31:24 -0000
@@ -7,11 +7,11 @@
*/
package org.apache.avalon.phoenix.components.deployer;
+import java.io.InputStream;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.tools.infobuilder.LegacyBlockInfoReader;
import org.apache.avalon.phoenix.containerkit.factory.DefaultComponentFactory;
-import java.io.InputStream;
/**
* A Phoenix-specific {@link
org.apache.excalibur.containerkit.factory.ComponentFactory}
Index: src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.83
diff -u -r1.83 DefaultEmbeddor.java
--- src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java 25 Jan
2003 15:47:17 -0000 1.83
+++ src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java 3 Feb
+2003 12:31:24 -0000
@@ -8,10 +8,10 @@
package org.apache.avalon.phoenix.components.embeddor;
import java.io.File;
+import java.net.URL;
import java.util.Date;
import java.util.Observable;
import java.util.Observer;
-import java.net.URL;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.ExtensionFileFilter;
Index:
src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java,v
retrieving revision 1.6
diff -u -r1.6 DefaultExtensionManager.java
---
src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java
1 Nov 2002 22:41:37 -0000 1.6
+++
+src/java/org/apache/avalon/phoenix/components/extensions/DefaultExtensionManager.java
+ 3 Feb 2003 12:31:24 -0000
@@ -9,10 +9,10 @@
import java.io.File;
import java.util.ArrayList;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.LogEnabled;
Index:
src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.32
diff -u -r1.32 DefaultApplicationContext.java
---
src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java 25
Jan 2003 15:47:17 -0000 1.32
+++
+src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java 3
+Feb 2003 12:31:25 -0000
@@ -25,14 +25,14 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ResourceUtil;
+import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
+import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
import org.apache.avalon.phoenix.interfaces.Kernel;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.avalon.phoenix.interfaces.SystemManager;
-import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
Index: src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.83
diff -u -r1.83 DefaultKernel.java
--- src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java 25 Jan
2003 15:47:17 -0000 1.83
+++ src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java 3 Feb
+2003 12:31:26 -0000
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.application.DefaultApplication;
+import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationMBean;
@@ -34,8 +35,6 @@
import org.apache.avalon.phoenix.interfaces.Kernel;
import org.apache.avalon.phoenix.interfaces.KernelMBean;
import org.apache.avalon.phoenix.interfaces.SystemManager;
-import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
/**
* The ServerKernel is the core of the Phoenix system.
@@ -57,6 +56,16 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultKernel.class );
+ /**
+ * The interfaces of application that are exported to Management system.
+ * Declared up here to avoid classloader deadlock issues where ApplicationMBean
+ * is loaded after the application starts. If the application is also loading
+ * classes and happens to recursively enter the bootstrap classloader a deadlock
+ * can be caused. P{lacing class interfaces up here avoids this deadlock.
+ */
+ private static final Class[] APPLICATION_INTERFACES =
+ new Class[]{ApplicationMBean.class};
+
///SystemManager provided by Embeddor
private SystemManager m_systemManager;
@@ -206,7 +215,7 @@
{
m_applicationManager.register( name,
application,
- new
Class[]{ApplicationMBean.class} );
+ APPLICATION_INTERFACES );
}
catch( final Throwable t )
{
Index: src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java,v
retrieving revision 1.18
diff -u -r1.18 SarEntry.java
--- src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java 25 Jan 2003
15:47:17 -0000 1.18
+++ src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java 3 Feb 2003
+12:31:26 -0000
@@ -10,8 +10,8 @@
import java.io.File;
import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.interfaces.Application;
/**
* This is the structure describing each server application before it is loaded.
Index:
src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
retrieving revision 1.8
diff -u -r1.8 BeanShellKernelProxy.java
---
src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
25 Jan 2003 15:47:17 -0000 1.8
+++
+src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
+ 3 Feb 2003 12:31:26 -0000
@@ -9,11 +9,9 @@
import java.io.File;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.Kernel;
-import org.apache.avalon.phoenix.metadata.SarMetaData;
public class BeanShellKernelProxy
implements Kernel
Index: src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java,v
retrieving revision 1.3
diff -u -r1.3 HostedSystemManager.java
--- src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
7 Dec 2002 08:57:51 -0000 1.3
+++ src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
+ 3 Feb 2003 12:31:26 -0000
@@ -10,12 +10,6 @@
import java.util.ArrayList;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
/**
* This is a hosted version of System Manager. It assumes
Index: src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
retrieving revision 1.21
diff -u -r1.21 MX4JSystemManager.java
--- src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
7 Dec 2002 04:51:35 -0000 1.21
+++ src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
+ 3 Feb 2003 12:31:27 -0000
@@ -17,17 +17,17 @@
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
import javax.management.ReflectionException;
+import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
+import mx4j.log.Log;
+import mx4j.util.StandardMBeanProxy;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
-import mx4j.log.Log;
-import mx4j.util.StandardMBeanProxy;
/**
* This component is responsible for managing phoenix instance.
@@ -69,7 +69,7 @@
{
m_host = configuration.getChild( "manager-adaptor-host" ).
getValue( DEFAULT_HTTPADAPTER_HOST );
-
+
m_port = configuration.getChild( "manager-adaptor-port" ).
getValueAsInteger( DEFAULT_HTTPADAPTER_PORT );
Index:
src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java,v
retrieving revision 1.2
diff -u -r1.2 ComponentMetaDataConverter.java
--- src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
25 Jan 2003 15:47:17 -0000 1.2
+++ src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
+ 3 Feb 2003 12:31:28 -0000
@@ -12,14 +12,14 @@
import org.apache.avalon.framework.info.Attribute;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
+import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
-import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
/**
* Convert a {@link ComponentMetaData} into a {@link BlockMetaData}.
Index: src/java/org/apache/avalon/phoenix/containerkit/demo/SimpleServiceKernel.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/demo/SimpleServiceKernel.java,v
retrieving revision 1.1
diff -u -r1.1 SimpleServiceKernel.java
--- src/java/org/apache/avalon/phoenix/containerkit/demo/SimpleServiceKernel.java
18 Jan 2003 16:43:43 -0000 1.1
+++ src/java/org/apache/avalon/phoenix/containerkit/demo/SimpleServiceKernel.java
+ 3 Feb 2003 12:31:28 -0000
@@ -7,6 +7,8 @@
*/
package org.apache.avalon.phoenix.containerkit.demo;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -19,8 +21,6 @@
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.MetaDataBuilder;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import java.util.Map;
-import java.util.HashMap;
/**
* This is a simple ServiceKernel.
Index: src/java/org/apache/avalon/phoenix/containerkit/metadata/DependencyMetaData.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/metadata/DependencyMetaData.java,v
retrieving revision 1.1
diff -u -r1.1 DependencyMetaData.java
--- src/java/org/apache/avalon/phoenix/containerkit/metadata/DependencyMetaData.java
18 Jan 2003 16:43:44 -0000 1.1
+++ src/java/org/apache/avalon/phoenix/containerkit/metadata/DependencyMetaData.java
+ 3 Feb 2003 12:31:28 -0000
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.phoenix.containerkit.metadata;
-import org.apache.avalon.framework.info.FeatureDescriptor;
import org.apache.avalon.framework.info.Attribute;
+import org.apache.avalon.framework.info.FeatureDescriptor;
/**
* The {@link DependencyMetaData} is the mapping of a component as a dependency
Index: src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.20
diff -u -r1.20 ApplicationContext.java
--- src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java 25 Jan
2003 15:47:18 -0000 1.20
+++ src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java 3 Feb
+2003 12:31:29 -0000
@@ -12,7 +12,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
import org.apache.excalibur.threadcontext.ThreadContext;
Index: src/java/org/apache/avalon/phoenix/interfaces/LogManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/LogManager.java,v
retrieving revision 1.11
diff -u -r1.11 LogManager.java
--- src/java/org/apache/avalon/phoenix/interfaces/LogManager.java 2 Nov 2002
00:29:28 -0000 1.11
+++ src/java/org/apache/avalon/phoenix/interfaces/LogManager.java 3 Feb 2003
+12:31:29 -0000
@@ -8,8 +8,8 @@
package org.apache.avalon.phoenix.interfaces;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.Logger;
/**
* Interface that is used to manage Log objects for a Sar.
Index: src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java,v
retrieving revision 1.4
diff -u -r1.4 MetaGenerateTask.java
--- src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java 25 Jan
2003 15:47:18 -0000 1.4
+++ src/java/org/apache/avalon/phoenix/tools/metagenerate/MetaGenerateTask.java 3 Feb
+2003 12:31:29 -0000
@@ -9,8 +9,8 @@
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import org.apache.avalon.framework.tools.ant.FormatEnum;
import org.apache.tools.ant.BuildException;
Index: src/java/org/apache/avalon/phoenix/tools/metagenerate/XinfoFactory.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/metagenerate/XinfoFactory.java,v
retrieving revision 1.7
diff -u -r1.7 XinfoFactory.java
--- src/java/org/apache/avalon/phoenix/tools/metagenerate/XinfoFactory.java 20 Oct
2002 12:12:34 -0000 1.7
+++ src/java/org/apache/avalon/phoenix/tools/metagenerate/XinfoFactory.java 3 Feb
+2003 12:31:30 -0000
@@ -13,9 +13,9 @@
import com.thoughtworks.qdox.model.Type;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.ArrayList;
/**
* A Xinfo Factory
Index: src/java/org/apache/avalon/phoenix/tools/punit/PUnit.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnit.java,v
retrieving revision 1.5
diff -u -r1.5 PUnit.java
--- src/java/org/apache/avalon/phoenix/tools/punit/PUnit.java 18 Jan 2003 16:43:42
-0000 1.5
+++ src/java/org/apache/avalon/phoenix/tools/punit/PUnit.java 3 Feb 2003 12:31:30
+-0000
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.phoenix.tools.punit;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
/**
* PUnit helper
@@ -16,7 +16,6 @@
*/
public interface PUnit
{
-
/**
* Query the log
* @param startsWith For an expression that starts with this
@@ -38,17 +37,16 @@
* @param serviceName The service name (for lookup)
* @param configuration The configuration
*/
- void addBlock( final String blockName,
- final String serviceName,
- final Object block,
- final Configuration configuration );
+ void addBlock( String blockName,
+ String serviceName,
+ Object block,
+ Configuration configuration );
/**
* Run blocks thru startup.
* @throws LifecycleException If a problem
*/
void startup() throws LifecycleException;
-
/**
* Run blocks thru shutdown
Index: src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockContext.java,v
retrieving revision 1.2
diff -u -r1.2 PUnitBlockContext.java
--- src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockContext.java 12 Nov
2002 20:40:25 -0000 1.2
+++ src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlockContext.java 3 Feb
+2003 12:31:30 -0000
@@ -7,14 +7,13 @@
*/
package org.apache.avalon.phoenix.tools.punit;
-import org.apache.avalon.framework.logger.Logger;
+import java.io.File;
+import java.io.InputStream;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.BlockContext;
-import java.io.File;
-import java.io.InputStream;
-
/**
* PUnitBlockContext
* @author Paul Hammant
@@ -23,7 +22,6 @@
extends DefaultContext
implements BlockContext
{
-
public File getBaseDirectory()
{
try
Index: src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java,v
retrieving revision 1.2
diff -u -r1.2 PUnitHelper.java
--- src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java 18 Jan 2003
16:43:42 -0000 1.2
+++ src/java/org/apache/avalon/phoenix/tools/punit/PUnitHelper.java 3 Feb 2003
+12:31:30 -0000
@@ -7,19 +7,20 @@
*/
package org.apache.avalon.phoenix.tools.punit;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
+import java.util.ArrayList;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.service.DefaultServiceManager;
-import java.util.ArrayList;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
/**
* PUnit helper
* @author Paul Hammant
*/
-public final class PUnitHelper implements PUnit, Initializable
+public final class PUnitHelper
+ implements PUnit, Initializable
{
private LifecycleHelper m_lifecycleHelper;
private ArrayList m_blocks;
Index: src/java/org/apache/avalon/phoenix/tools/punit/PUnitLogger.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitLogger.java,v
retrieving revision 1.2
diff -u -r1.2 PUnitLogger.java
--- src/java/org/apache/avalon/phoenix/tools/punit/PUnitLogger.java 12 Nov 2002
20:40:25 -0000 1.2
+++ src/java/org/apache/avalon/phoenix/tools/punit/PUnitLogger.java 3 Feb 2003
+12:31:30 -0000
@@ -7,9 +7,8 @@
*/
package org.apache.avalon.phoenix.tools.punit;
-import org.apache.avalon.framework.logger.Logger;
-
import java.util.ArrayList;
+import org.apache.avalon.framework.logger.Logger;
/**
* PunitLogger
Index: src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java,v
retrieving revision 1.9
diff -u -r1.9 PUnitTestCase.java
--- src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java 18 Jan 2003
16:43:42 -0000 1.9
+++ src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java 3 Feb 2003
+12:31:31 -0000
@@ -7,13 +7,9 @@
*/
package org.apache.avalon.phoenix.tools.punit;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
-import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.service.DefaultServiceManager;
import junit.framework.TestCase;
-import java.util.ArrayList;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
/**
* PUnitTestCase
Index: src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestWriter.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestWriter.java,v
retrieving revision 1.1
diff -u -r1.1 ManifestWriter.java
--- src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestWriter.java 2 Oct
2002 19:39:07 -0000 1.1
+++ src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestWriter.java 3 Feb
+2003 12:31:31 -0000
@@ -8,8 +8,8 @@
package org.apache.avalon.phoenix.tools.xdoclet;
import java.io.File;
-import java.io.IOException;
import java.io.FileWriter;
+import java.io.IOException;
public class ManifestWriter
{
Index: src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java,v
retrieving revision 1.14
diff -u -r1.14 PhoenixXDoclet.java
--- src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java 5 Nov
2002 23:56:03 -0000 1.14
+++ src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java 3 Feb
+2003 12:31:32 -0000
@@ -7,16 +7,15 @@
*/
package org.apache.avalon.phoenix.tools.xdoclet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
/**
* This task used to invoke XDoclet. It has bee deprecated for another taskdef called
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
