You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/04/05 06:25:45 UTC
cvs commit: avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test PUnitTestCaseTestCase.java TestBlock.java
donaldp 2003/04/04 20:25:45
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockEntry.java BlockResourceProvider.java
DefaultApplication.java DependencyGraph.java
ExportHelper.java
src/java/org/apache/avalon/phoenix/components/assembler
Assembler.java
src/java/org/apache/avalon/phoenix/components/classloader
SarPolicyResolver.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java PhoenixComponentFactory.java
PhoenixProfileBuilder.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java
src/java/org/apache/avalon/phoenix/components/logger
DefaultLogManager.java
ExtendedLog4jLoggerManager.java
src/java/org/apache/avalon/phoenix/components/manager
HostedSystemManager.java MBeanScripter.java
src/java/org/apache/avalon/phoenix/components/util
ComponentMetaDataConverter.java
src/java/org/apache/avalon/phoenix/containerkit/factory
DefaultComponentFactory.java
src/java/org/apache/avalon/phoenix/containerkit/lifecycle/impl
AbstractResourceProvider.java
src/java/org/apache/avalon/phoenix/containerkit/metadata
ComponentMetaData.java
src/java/org/apache/avalon/phoenix/containerkit/profile
ComponentProfile.java
src/java/org/apache/avalon/phoenix/containerkit/verifier
AssemblyVerifier.java
src/java/org/apache/avalon/phoenix/framework/tools/ant
ComponentVerifierTask.java FormatEnum.java
MetaGenerateTask.java
src/java/org/apache/avalon/phoenix/framework/tools/infobuilder
InfoBuilder.java LegacyBlockInfoReader.java
LegacyBlockInfoWriter.java LegacyUtil.java
XMLInfoReader.java XMLInfoWriter.java
src/java/org/apache/avalon/phoenix/framework/tools/qdox
DefaultInfoBuilder.java
src/java/org/apache/avalon/phoenix/framework/tools/verifier
InfoVerifier.java
src/java/org/apache/avalon/phoenix/frontends CLISetup.java
src/java/org/apache/avalon/phoenix/interfaces
ApplicationContext.java
src/java/org/apache/avalon/phoenix/launcher
DaemonLauncher.java
src/java/org/apache/avalon/phoenix/tools/configuration
ConfigurationBuilder.java
src/java/org/apache/avalon/phoenix/tools/punit
PUnitResourceProvider.java
src/java/org/apache/avalon/phoenix/tools/verifier
SarVerifier.java
src/test/org/apache/avalon/phoenix/components/application/test
MockApplicationContext.java
src/test/org/apache/avalon/phoenix/components/logger/test
LogManagerTestCase.java
src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test
InfoAssert.java InfoBuilderTestCase.java
src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data
QDoxComponent1.java
src/test/org/apache/avalon/phoenix/test
AbstractContainerTestCase.java
src/test/org/apache/avalon/phoenix/tools/assembler/test
AssemblerTestCase.java
src/test/org/apache/avalon/phoenix/tools/punit/test
PUnitTestCaseTestCase.java TestBlock.java
Log:
Styled and cleaned up imports.
Revision Changes Path
1.32 +2 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
Index: BlockEntry.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- BlockEntry.java 23 Mar 2003 00:19:48 -0000 1.31
+++ BlockEntry.java 5 Apr 2003 04:25:41 -0000 1.32
@@ -50,11 +50,11 @@
package org.apache.avalon.phoenix.components.application;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.phoenix.interfaces.ContainerConstants;
-import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* This is the structure describing each block before it is loaded.
@@ -175,7 +175,6 @@
return classes;
}
-
private static Class getBlockClass()
{
try
@@ -187,4 +186,4 @@
throw new IllegalStateException( "Can not find block class" );
}
}
- }
+}
1.21 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
Index: BlockResourceProvider.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BlockResourceProvider.java 22 Mar 2003 12:07:07 -0000 1.20
+++ BlockResourceProvider.java 5 Apr 2003 04:25:41 -0000 1.21
@@ -64,7 +64,6 @@
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.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
@@ -73,6 +72,7 @@
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.excalibur.instrument.InstrumentManager;
1.46 +1 -1 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- DefaultApplication.java 23 Mar 2003 00:19:48 -0000 1.45
+++ DefaultApplication.java 5 Apr 2003 04:25:41 -0000 1.46
@@ -63,7 +63,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockListener;
-import org.apache.avalon.phoenix.interfaces.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;
@@ -73,6 +72,7 @@
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.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.excalibur.threadcontext.ThreadContext;
1.16 +1 -1 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DependencyGraph.java 22 Mar 2003 12:07:07 -0000 1.15
+++ DependencyGraph.java 5 Apr 2003 04:25:42 -0000 1.16
@@ -51,9 +51,9 @@
package org.apache.avalon.phoenix.components.application;
import java.util.ArrayList;
-import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
/**
*
1.10 +3 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java
Index: ExportHelper.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExportHelper.java 22 Mar 2003 12:07:07 -0000 1.9
+++ ExportHelper.java 5 Apr 2003 04:25:42 -0000 1.10
@@ -54,10 +54,10 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.CascadingException;
-import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyUtil;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyUtil;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
/**
1.9 +3 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java
Index: Assembler.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Assembler.java 23 Mar 2003 00:19:48 -0000 1.8
+++ Assembler.java 5 Apr 2003 04:25:42 -0000 1.9
@@ -57,13 +57,13 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.MetaDataBuilder;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
+import org.apache.avalon.phoenix.framework.info.Attribute;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
/**
* Assemble a {@link PartitionMetaData} object from a Configuration
1.9 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java
Index: SarPolicyResolver.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyResolver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SarPolicyResolver.java 22 Mar 2003 12:07:08 -0000 1.8
+++ SarPolicyResolver.java 5 Apr 2003 04:25:42 -0000 1.9
@@ -62,8 +62,8 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.BlockContext;
-import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.avalon.phoenix.components.util.PropertyUtil;
+import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.excalibur.policy.builder.PolicyResolver;
/**
1.77 +1 -1 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- DefaultDeployer.java 5 Apr 2003 04:14:29 -0000 1.76
+++ DefaultDeployer.java 5 Apr 2003 04:25:42 -0000 1.77
@@ -485,7 +485,7 @@
private Configuration getConfigurationFor( final Map install, final String key )
throws DeploymentException
{
- final String location = (String)install.get(key );
+ final String location = (String)install.get( key );
try
{
return ConfigurationBuilder.build( new InputSource( location ), false );
1.7 +3 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java
Index: PhoenixComponentFactory.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixComponentFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PhoenixComponentFactory.java 22 Mar 2003 12:07:09 -0000 1.6
+++ PhoenixComponentFactory.java 5 Apr 2003 04:25:42 -0000 1.7
@@ -51,10 +51,10 @@
package org.apache.avalon.phoenix.components.deployer;
import java.io.InputStream;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoReader;
import org.apache.avalon.phoenix.containerkit.factory.DefaultComponentFactory;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoReader;
/**
* A Phoenix-specific {@link org.apache.excalibur.containerkit.factory.ComponentFactory}
1.7 +12 -12 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixProfileBuilder.java
Index: PhoenixProfileBuilder.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixProfileBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PhoenixProfileBuilder.java 23 Mar 2003 00:19:48 -0000 1.6
+++ PhoenixProfileBuilder.java 5 Apr 2003 04:25:42 -0000 1.7
@@ -50,21 +50,21 @@
package org.apache.avalon.phoenix.components.deployer;
-import org.apache.avalon.phoenix.containerkit.profile.ProfileBuilder;
-import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.factory.ComponentFactory;
-import org.apache.avalon.phoenix.containerkit.factory.ComponentBundle;
-import org.apache.avalon.phoenix.components.assembler.Assembler;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
+import java.util.ArrayList;
+import java.util.Map;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.phoenix.components.assembler.Assembler;
+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.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ProfileBuilder;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyUtil;
-import java.util.Map;
-import java.util.ArrayList;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
/**
*
1.40 +1 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- DefaultApplicationContext.java 23 Mar 2003 00:19:48 -0000 1.39
+++ DefaultApplicationContext.java 5 Apr 2003 04:25:42 -0000 1.40
@@ -56,7 +56,6 @@
import java.io.InputStream;
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.activity.Initializable;
@@ -67,13 +66,13 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
import org.apache.avalon.phoenix.containerkit.profile.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.ContainerConstants;
import org.apache.avalon.phoenix.interfaces.Kernel;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.avalon.phoenix.interfaces.SystemManager;
1.34 +0 -1 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java
Index: DefaultLogManager.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DefaultLogManager.java 5 Apr 2003 02:13:23 -0000 1.33
+++ DefaultLogManager.java 5 Apr 2003 04:25:42 -0000 1.34
@@ -51,7 +51,6 @@
package org.apache.avalon.phoenix.components.logger;
import java.io.File;
-
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
1.2 +8 -8 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/ExtendedLog4jLoggerManager.java
Index: ExtendedLog4jLoggerManager.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/ExtendedLog4jLoggerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtendedLog4jLoggerManager.java 5 Apr 2003 02:07:02 -0000 1.1
+++ ExtendedLog4jLoggerManager.java 5 Apr 2003 04:25:42 -0000 1.2
@@ -49,24 +49,24 @@
*/
package org.apache.avalon.phoenix.components.logger;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.avalon.excalibur.logger.Log4JLoggerManager;
+import org.apache.avalon.framework.activity.Initializable;
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.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.log4j.xml.DOMConfigurator;
-import org.w3c.dom.Element;
+import org.realityforge.configkit.PropertyExpander;
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.realityforge.configkit.PropertyExpander;
-import java.util.Map;
-import java.util.HashMap;
+import org.w3c.dom.NodeList;
/**
* A LoggerManager for Log4j that will configure the Log4j subsystem
1.8 +32 -32 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java
Index: HostedSystemManager.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/HostedSystemManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HostedSystemManager.java 22 Mar 2003 12:07:10 -0000 1.7
+++ HostedSystemManager.java 5 Apr 2003 04:25:43 -0000 1.8
@@ -47,35 +47,35 @@
Apache Software Foundation, please see <http://www.apache.org/>.
*/
-
-package org.apache.avalon.phoenix.components.manager;
-
-import java.util.ArrayList;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-/**
- * This is a hosted version of System Manager. It assumes
- * a MBeanServer is already running.
- *
- * @author <a href="mailto:sshort at postx.com">Steve Short</a>
- */
-public class HostedSystemManager
- extends AbstractJMXManager
-{
- protected MBeanServer createMBeanServer()
- throws Exception
- {
- final ArrayList serverList = MBeanServerFactory.findMBeanServer( null );
-
- if( serverList.size() == 0 )
- {
- getLogger().debug( "HostedSystemManager createMBeanServer no MBeanServer could be found" );
- return null;
- }
-
- MBeanServer ms = (MBeanServer)serverList.get( 0 );
- getLogger().debug( "HostedSystemManager createMBeanServer \"" + ms + "\"" );
- return ms;
- }
-}
+
+package org.apache.avalon.phoenix.components.manager;
+
+import java.util.ArrayList;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+/**
+ * This is a hosted version of System Manager. It assumes
+ * a MBeanServer is already running.
+ *
+ * @author <a href="mailto:sshort at postx.com">Steve Short</a>
+ */
+public class HostedSystemManager
+ extends AbstractJMXManager
+{
+ protected MBeanServer createMBeanServer()
+ throws Exception
+ {
+ final ArrayList serverList = MBeanServerFactory.findMBeanServer( null );
+
+ if( serverList.size() == 0 )
+ {
+ getLogger().debug( "HostedSystemManager createMBeanServer no MBeanServer could be found" );
+ return null;
+ }
+
+ MBeanServer ms = (MBeanServer)serverList.get( 0 );
+ getLogger().debug( "HostedSystemManager createMBeanServer \"" + ms + "\"" );
+ return ms;
+ }
+}
1.9 +12 -12 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java
Index: MBeanScripter.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanScripter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MBeanScripter.java 22 Mar 2003 12:07:10 -0000 1.8
+++ MBeanScripter.java 5 Apr 2003 04:25:43 -0000 1.9
@@ -136,7 +136,7 @@
m_mBeanServer.setAttribute( getObjectName(),
new Attribute( name, value ) );
}
-
+
private void setUses()
throws Exception
{
@@ -204,49 +204,49 @@
}
m_mBeanServer.invoke( getObjectName(), operationName, values, types );
}
-
+
private Object convertToObject( final Class valueClass, final String s )
{
Object value = null;
- if ( valueClass.equals( String.class ) )
+ if( valueClass.equals( String.class ) )
{
value = s;
}
- else if ( valueClass.equals( Byte.class ) )
+ else if( valueClass.equals( Byte.class ) )
{
value = new Byte( Byte.parseByte( s ) );
}
- else if ( valueClass.equals( Short.class ) )
+ else if( valueClass.equals( Short.class ) )
{
value = new Short( Short.parseShort( s ) );
}
- else if ( valueClass.equals( Integer.class ) )
+ else if( valueClass.equals( Integer.class ) )
{
value = new Integer( Integer.parseInt( s ) );
}
- else if ( valueClass.equals( Long.class ) )
+ else if( valueClass.equals( Long.class ) )
{
value = new Long( Long.parseLong( s ) );
}
- else if ( valueClass.equals( Float.class ) )
+ else if( valueClass.equals( Float.class ) )
{
value = new Float( Float.parseFloat( s ) );
}
- else if ( valueClass.equals( Double.class ) )
+ else if( valueClass.equals( Double.class ) )
{
value = new Double( Double.parseDouble( s ) );
}
- else if ( valueClass.equals( Character.class ) )
+ else if( valueClass.equals( Character.class ) )
{
value = new Character( s.charAt( 0 ) );
}
- else if ( valueClass.equals( Boolean.class ) )
+ else if( valueClass.equals( Boolean.class ) )
{
value = new Boolean( s );
}
else
{
- throw new UnsupportedOperationException ( "can't yet convert " + valueClass );
+ throw new UnsupportedOperationException( "can't yet convert " + valueClass );
}
return value;
}
1.10 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
Index: ComponentMetaDataConverter.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ComponentMetaDataConverter.java 23 Mar 2003 00:19:49 -0000 1.9
+++ ComponentMetaDataConverter.java 5 Apr 2003 04:25:43 -0000 1.10
@@ -52,12 +52,12 @@
import java.io.File;
import java.util.ArrayList;
-import org.apache.avalon.phoenix.framework.info.Attribute;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.framework.info.Attribute;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
1.7 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/factory/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/factory/DefaultComponentFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultComponentFactory.java 22 Mar 2003 12:07:11 -0000 1.6
+++ DefaultComponentFactory.java 5 Apr 2003 04:25:43 -0000 1.7
@@ -52,9 +52,9 @@
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoBuilder;
/**
1.6 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/lifecycle/impl/AbstractResourceProvider.java
Index: AbstractResourceProvider.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/lifecycle/impl/AbstractResourceProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractResourceProvider.java 22 Mar 2003 12:07:12 -0000 1.5
+++ AbstractResourceProvider.java 5 Apr 2003 04:25:43 -0000 1.6
@@ -61,9 +61,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
-import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
@@ -73,6 +70,9 @@
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
+import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
+import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
/**
* This is a base object via which the
1.6 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/metadata/ComponentMetaData.java
Index: ComponentMetaData.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/metadata/ComponentMetaData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentMetaData.java 22 Mar 2003 12:07:12 -0000 1.5
+++ ComponentMetaData.java 5 Apr 2003 04:25:43 -0000 1.6
@@ -50,12 +50,12 @@
package org.apache.avalon.phoenix.containerkit.metadata;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.FeatureDescriptor;
-import org.apache.avalon.framework.parameters.Parameters;
-import java.util.ArrayList;
-import java.util.List;
/**
* Each component declared in the application is represented by
1.4 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/profile/ComponentProfile.java
Index: ComponentProfile.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/profile/ComponentProfile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentProfile.java 22 Mar 2003 12:07:12 -0000 1.3
+++ ComponentProfile.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -50,8 +50,8 @@
package org.apache.avalon.phoenix.containerkit.profile;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
/**
* The ComponentProfile defines a component as a conjunction
1.8 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/verifier/AssemblyVerifier.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AssemblyVerifier.java 22 Mar 2003 12:07:12 -0000 1.7
+++ AssemblyVerifier.java 5 Apr 2003 04:25:43 -0000 1.8
@@ -54,13 +54,13 @@
import java.util.Stack;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
-import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* This Class verifies that Sars are valid. It performs a number
1.4 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/ComponentVerifierTask.java
Index: ComponentVerifierTask.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/ComponentVerifierTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentVerifierTask.java 22 Mar 2003 12:07:13 -0000 1.3
+++ ComponentVerifierTask.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -50,8 +50,8 @@
package org.apache.avalon.phoenix.framework.tools.ant;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoBuilder;
import org.apache.avalon.phoenix.framework.tools.verifier.InfoVerifier;
import org.apache.tools.ant.AntClassLoader;
1.4 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/FormatEnum.java
Index: FormatEnum.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/FormatEnum.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormatEnum.java 22 Mar 2003 12:07:13 -0000 1.3
+++ FormatEnum.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -65,7 +65,7 @@
public int getTypeCode()
{
final String value = super.getValue();
- if( value.equals( "legacy") )
+ if( value.equals( "legacy" ) )
{
return MetaGenerateTask.LEGACY_TYPE;
}
1.5 +5 -6 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/MetaGenerateTask.java
Index: MetaGenerateTask.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/ant/MetaGenerateTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MetaGenerateTask.java 4 Apr 2003 11:01:02 -0000 1.4
+++ MetaGenerateTask.java 5 Apr 2003 04:25:43 -0000 1.5
@@ -54,17 +54,16 @@
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.FileOutputStream;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.SerializedInfoWriter;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoWriter;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.XMLInfoWriter;
import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoWriter;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.SerializedInfoWriter;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.XMLInfoWriter;
import org.apache.avalon.phoenix.framework.tools.qdox.DefaultInfoBuilder;
import org.apache.avalon.phoenix.framework.tools.qdox.LegacyInfoBuilder;
-import org.apache.avalon.phoenix.framework.tools.ant.FormatEnum;
import org.apache.tools.ant.BuildException;
/**
@@ -315,7 +314,7 @@
{
return c_xmlWriter;
}
- else if( SER_TYPE == m_format )
+ else if( SER_TYPE == m_format )
{
return c_serWriter;
}
1.5 +1 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/InfoBuilder.java
Index: InfoBuilder.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/InfoBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InfoBuilder.java 22 Mar 2003 12:07:13 -0000 1.4
+++ InfoBuilder.java 5 Apr 2003 04:25:43 -0000 1.5
@@ -51,7 +51,6 @@
package org.apache.avalon.phoenix.framework.tools.infobuilder;
import java.io.InputStream;
-
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
1.6 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoReader.java
Index: LegacyBlockInfoReader.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LegacyBlockInfoReader.java 5 Apr 2003 04:21:47 -0000 1.5
+++ LegacyBlockInfoReader.java 5 Apr 2003 04:25:43 -0000 1.6
@@ -56,6 +56,7 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
@@ -64,7 +65,6 @@
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.InputSource;
/**
1.4 +2 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoWriter.java
Index: LegacyBlockInfoWriter.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LegacyBlockInfoWriter.java 22 Mar 2003 12:07:13 -0000 1.3
+++ LegacyBlockInfoWriter.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -168,7 +168,6 @@
writer.write( "</services>" );
}
-
/**
* Write out xml representation of a set of services.
*
@@ -177,7 +176,7 @@
* @throws IOException if unable to write xml
*/
private void writeMxServices( final Writer writer,
- final ServiceDescriptor[] services )
+ final ServiceDescriptor[] services )
throws IOException
{
if( 0 == services.length )
1.4 +7 -7 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyUtil.java
Index: LegacyUtil.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LegacyUtil.java 22 Mar 2003 12:07:13 -0000 1.3
+++ LegacyUtil.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -50,17 +50,17 @@
package org.apache.avalon.phoenix.framework.tools.infobuilder;
+import java.util.Properties;
+import org.apache.avalon.framework.Version;
import org.apache.avalon.phoenix.framework.info.Attribute;
+import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
+import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
import org.apache.avalon.phoenix.framework.info.FeatureDescriptor;
-import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
-import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
-import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
-import org.apache.avalon.framework.Version;
-import java.util.Properties;
+import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
/**
* This is a set of constants and utility methods
1.6 +1 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoReader.java
Index: XMLInfoReader.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLInfoReader.java 5 Apr 2003 04:21:47 -0000 1.5
+++ XMLInfoReader.java 5 Apr 2003 04:25:43 -0000 1.6
@@ -53,7 +53,6 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Properties;
-
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
1.4 +8 -8 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoWriter.java
Index: XMLInfoWriter.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLInfoWriter.java 22 Mar 2003 12:07:13 -0000 1.3
+++ XMLInfoWriter.java 5 Apr 2003 04:25:43 -0000 1.4
@@ -50,19 +50,19 @@
package org.apache.avalon.phoenix.framework.tools.infobuilder;
-import java.io.OutputStream;
import java.io.IOException;
-import java.io.Writer;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
+import java.io.Writer;
import org.apache.avalon.phoenix.framework.info.Attribute;
-import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
+import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
-import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
-import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
+import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
+import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
+import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
/**
* Write {@link ComponentInfo} objects to a stream as xml documents.
1.5 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/qdox/DefaultInfoBuilder.java
Index: DefaultInfoBuilder.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/qdox/DefaultInfoBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultInfoBuilder.java 4 Apr 2003 11:01:03 -0000 1.4
+++ DefaultInfoBuilder.java 5 Apr 2003 04:25:44 -0000 1.5
@@ -54,6 +54,7 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod;
import java.util.ArrayList;
+import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
@@ -62,7 +63,6 @@
import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.phoenix.framework.info.Attribute;
/**
* This is a utility class that is used to build a ComponentInfo object
1.5 +8 -8 avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/verifier/InfoVerifier.java
Index: InfoVerifier.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/verifier/InfoVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InfoVerifier.java 4 Apr 2003 10:56:51 -0000 1.4
+++ InfoVerifier.java 5 Apr 2003 04:25:44 -0000 1.5
@@ -53,16 +53,16 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
-import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.phoenix.framework.info.ComponentInfo;
+import org.apache.avalon.phoenix.framework.info.ContextDescriptor;
+import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
+import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
/**
* This Class verifies that an implementation is valid wrt the
@@ -93,7 +93,7 @@
{
private static final Resources REZ =
ResourceManager.getPackageResources( InfoVerifier.class );
-
+
/**
* The verifier for components in assembly.
*/
1.26 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
Index: CLISetup.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- CLISetup.java 22 Mar 2003 12:07:14 -0000 1.25
+++ CLISetup.java 5 Apr 2003 04:25:44 -0000 1.26
@@ -51,14 +51,14 @@
package org.apache.avalon.phoenix.frontends;
import java.util.List;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.phoenix.interfaces.SystemManager;
import org.apache.avalon.excalibur.cli.CLArgsParser;
import org.apache.avalon.excalibur.cli.CLOption;
import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
import org.apache.avalon.excalibur.cli.CLUtil;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.phoenix.interfaces.SystemManager;
/**
* The class prepare parameters based on input options.
1.26 +2 -2 avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ApplicationContext.java 22 Mar 2003 12:07:14 -0000 1.25
+++ ApplicationContext.java 5 Apr 2003 04:25:44 -0000 1.26
@@ -56,8 +56,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
-import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.threadcontext.ThreadContext;
/**
* Manage the "context" in which Applications operate.
@@ -154,5 +154,5 @@
* @param component the component
* @return the name to use for Instrumentables
*/
- String getInstrumentableName( String component);
+ String getInstrumentableName( String component );
}
1.19 +5 -5 avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java
Index: DaemonLauncher.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DaemonLauncher.java 22 Mar 2003 12:07:15 -0000 1.18
+++ DaemonLauncher.java 5 Apr 2003 04:25:44 -0000 1.19
@@ -50,11 +50,11 @@
package org.apache.avalon.phoenix.launcher;
-import org.tanukisoftware.wrapper.WrapperListener;
-import org.tanukisoftware.wrapper.WrapperManager;
import java.util.Hashtable;
import java.util.Observable;
import java.util.Observer;
+import org.tanukisoftware.wrapper.WrapperListener;
+import org.tanukisoftware.wrapper.WrapperManager;
/**
* A frontend for Phoenix that starts it as a native service
@@ -79,7 +79,7 @@
* WrapperListener Methods
*-------------------------------------------------------------*/
/**
- * The start method is called when the WrapperManager is signaled by the
+ * The start method is called when the WrapperManager is signaled by the
* native wrapper code that it can start its application. This
* method call is expected to return, so a new thread should be launched
* if necessary.
@@ -158,8 +158,8 @@
/**
* Called whenever the native wrapper code traps a system control signal
* against the Java process. It is up to the callback to take any actions
- * necessary. Possible values are: WrapperManager.WRAPPER_CTRL_C_EVENT,
- * WRAPPER_CTRL_CLOSE_EVENT, WRAPPER_CTRL_LOGOFF_EVENT, or
+ * necessary. Possible values are: WrapperManager.WRAPPER_CTRL_C_EVENT,
+ * WRAPPER_CTRL_CLOSE_EVENT, WRAPPER_CTRL_LOGOFF_EVENT, or
* WRAPPER_CTRL_SHUTDOWN_EVENT
*
* @param event The system control signal.
1.16 +3 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java
Index: ConfigurationBuilder.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ConfigurationBuilder.java 5 Apr 2003 04:11:18 -0000 1.15
+++ ConfigurationBuilder.java 5 Apr 2003 04:25:44 -0000 1.16
@@ -56,11 +56,11 @@
import javax.xml.parsers.SAXParserFactory;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.realityforge.configkit.ResolverFactory;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.EntityResolver;
-import org.realityforge.configkit.ResolverFactory;
/**
* Utility class used to load Configuration trees from XML files.
1.13 +1 -1 avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitResourceProvider.java
Index: PUnitResourceProvider.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitResourceProvider.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PUnitResourceProvider.java 22 Mar 2003 12:07:16 -0000 1.12
+++ PUnitResourceProvider.java 5 Apr 2003 04:25:44 -0000 1.13
@@ -58,8 +58,8 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
-import org.apache.excalibur.instrument.manager.NoopInstrumentManager;
import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.manager.NoopInstrumentManager;
/**
* PUnitResourceProvider
1.37 +4 -4 avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- SarVerifier.java 23 Mar 2003 00:19:49 -0000 1.36
+++ SarVerifier.java 5 Apr 2003 04:25:44 -0000 1.37
@@ -53,13 +53,13 @@
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.phoenix.framework.tools.verifier.InfoVerifier;
-import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.containerkit.verifier.AssemblyVerifier;
+import org.apache.avalon.phoenix.framework.tools.verifier.InfoVerifier;
+import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
/**
* This Class verifies that Sars are valid. It performs a number
1.10 +3 -3 avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java
Index: MockApplicationContext.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MockApplicationContext.java 22 Mar 2003 12:07:17 -0000 1.9
+++ MockApplicationContext.java 5 Apr 2003 04:25:44 -0000 1.10
@@ -58,10 +58,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
-import org.apache.excalibur.threadcontext.ThreadContext;
-import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.instrument.manager.NoopInstrumentManager;
+import org.apache.excalibur.threadcontext.ThreadContext;
+import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
/**
*
1.11 +3 -3 avalon-phoenix/src/test/org/apache/avalon/phoenix/components/logger/test/LogManagerTestCase.java
Index: LogManagerTestCase.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/components/logger/test/LogManagerTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LogManagerTestCase.java 22 Mar 2003 12:07:17 -0000 1.10
+++ LogManagerTestCase.java 5 Apr 2003 04:25:44 -0000 1.11
@@ -58,15 +58,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.components.logger.DefaultLogManager;
import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.avalon.phoenix.BlockContext;
/**
* An basic test case for the LogManager.
1.4 +2 -2 avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/InfoAssert.java
Index: InfoAssert.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/InfoAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InfoAssert.java 22 Mar 2003 12:07:17 -0000 1.3
+++ InfoAssert.java 5 Apr 2003 04:25:44 -0000 1.4
@@ -58,8 +58,8 @@
import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.framework.info.EntryDescriptor;
import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
-import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
+import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
/**
* A set of utilities for asserting facts about info objects.
1.4 +4 -4 avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/InfoBuilderTestCase.java
Index: InfoBuilderTestCase.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/InfoBuilderTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InfoBuilderTestCase.java 22 Mar 2003 12:07:17 -0000 1.3
+++ InfoBuilderTestCase.java 5 Apr 2003 04:25:44 -0000 1.4
@@ -62,6 +62,7 @@
import java.util.Properties;
import junit.framework.TestCase;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentDescriptor;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
@@ -71,16 +72,15 @@
import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoBuilder;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoReader;
import org.apache.avalon.phoenix.framework.tools.infobuilder.InfoWriter;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoReader;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoWriter;
import org.apache.avalon.phoenix.framework.tools.infobuilder.SerializedInfoReader;
import org.apache.avalon.phoenix.framework.tools.infobuilder.SerializedInfoWriter;
import org.apache.avalon.phoenix.framework.tools.infobuilder.XMLInfoReader;
import org.apache.avalon.phoenix.framework.tools.infobuilder.XMLInfoWriter;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoReader;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyBlockInfoWriter;
import org.apache.avalon.phoenix.framework.tools.qdox.DefaultInfoBuilder;
import org.apache.avalon.phoenix.framework.tools.qdox.LegacyInfoBuilder;
1.5 +11 -11 avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data/QDoxComponent1.java
Index: QDoxComponent1.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data/QDoxComponent1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- QDoxComponent1.java 4 Apr 2003 21:49:14 -0000 1.4
+++ QDoxComponent1.java 5 Apr 2003 04:25:45 -0000 1.5
@@ -51,19 +51,19 @@
package org.apache.avalon.phoenix.framework.tools.infobuilder.test.data;
import java.io.Serializable;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.test.data.otherpkg.Service2;
-import org.apache.avalon.phoenix.framework.tools.infobuilder.test.data.otherpkg.Service3;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
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.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.test.data.otherpkg.Service2;
+import org.apache.avalon.phoenix.framework.tools.infobuilder.test.data.otherpkg.Service3;
/**
* A simple avalon component to test QDox loading of info etc.
1.10 +2 -2 avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java
Index: AbstractContainerTestCase.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractContainerTestCase.java 5 Apr 2003 03:57:09 -0000 1.9
+++ AbstractContainerTestCase.java 5 Apr 2003 04:25:45 -0000 1.10
@@ -56,9 +56,9 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.components.deployer.PhoenixProfileBuilder;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
import org.xml.sax.InputSource;
1.13 +5 -5 avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java
Index: AssemblerTestCase.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AssemblerTestCase.java 23 Mar 2003 00:19:49 -0000 1.12
+++ AssemblerTestCase.java 5 Apr 2003 04:25:45 -0000 1.13
@@ -50,15 +50,15 @@
package org.apache.avalon.phoenix.tools.assembler.test;
+import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
import org.apache.avalon.phoenix.test.data.Component1;
import org.apache.avalon.phoenix.test.data.Component2;
import org.apache.avalon.phoenix.test.data.Component3;
import org.apache.avalon.phoenix.test.data.Service2;
-import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.interfaces.ContainerConstants;
/**
* An basic test case for the LogManager.
1.4 +16 -18 avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/PUnitTestCaseTestCase.java
Index: PUnitTestCaseTestCase.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/PUnitTestCaseTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PUnitTestCaseTestCase.java 22 Mar 2003 11:37:26 -0000 1.3
+++ PUnitTestCaseTestCase.java 5 Apr 2003 04:25:45 -0000 1.4
@@ -50,42 +50,40 @@
package org.apache.avalon.phoenix.tools.punit.test;
-import org.apache.avalon.phoenix.tools.punit.PUnitTestCase;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import java.io.StringReader;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.phoenix.tools.punit.PUnitTestCase;
import org.xml.sax.InputSource;
-import java.io.StringReader;
-
public class PUnitTestCaseTestCase extends PUnitTestCase
{
DefaultConfigurationBuilder m_defaultConfigurationBuilder = new DefaultConfigurationBuilder();
-
- public PUnitTestCaseTestCase(String name)
+ public PUnitTestCaseTestCase( String name )
{
- super(name);
+ super( name );
}
public void testBasicBlock() throws Exception
{
TestBlock block = new TestBlock();
Configuration configuration = m_defaultConfigurationBuilder.build(
- new InputSource(new StringReader("<hi>Hi</hi>")));
- addBlock("bl","block", block, configuration);
+ new InputSource( new StringReader( "<hi>Hi</hi>" ) ) );
+ addBlock( "bl", "block", block, configuration );
startup();
// check lifecycle run thru
- assertNotNull("Configuration null", block.m_configuration);
- assertNotNull("Context null", block.m_context);
- assertNotNull("Logger null", block.m_logger);
- assertNotNull("ServiceManager null", block.m_serviceManager);
- assertTrue("Not Initialized", block.m_initialized);
+ assertNotNull( "Configuration null", block.m_configuration );
+ assertNotNull( "Context null", block.m_context );
+ assertNotNull( "Logger null", block.m_logger );
+ assertNotNull( "ServiceManager null", block.m_serviceManager );
+ assertTrue( "Not Initialized", block.m_initialized );
// check lifecycle events logged
- assertTrue("Service Not logged", super.logHasEntry("I:service"));
- assertTrue("Initialize Not logged", super.logHasEntry("W:initialize"));
- assertTrue("Contextualize Not logged", super.logHasEntry("E:contextualize"));
- assertTrue("Configure Not logged", super.logHasEntry("F:configure"));
+ assertTrue( "Service Not logged", super.logHasEntry( "I:service" ) );
+ assertTrue( "Initialize Not logged", super.logHasEntry( "W:initialize" ) );
+ assertTrue( "Contextualize Not logged", super.logHasEntry( "E:contextualize" ) );
+ assertTrue( "Configure Not logged", super.logHasEntry( "F:configure" ) );
shutdown();
}
1.4 +13 -14 avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/TestBlock.java
Index: TestBlock.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/TestBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBlock.java 22 Mar 2003 11:37:26 -0000 1.3
+++ TestBlock.java 5 Apr 2003 04:25:45 -0000 1.4
@@ -50,21 +50,21 @@
package org.apache.avalon.phoenix.tools.punit.test;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.activity.Initializable;
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.activity.Initializable;
-import org.apache.avalon.framework.context.Contextualizable;
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.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
public class TestBlock
- implements Serviceable, Configurable, Initializable, Contextualizable, LogEnabled
+ implements Serviceable, Configurable, Initializable, Contextualizable, LogEnabled
{
public ServiceManager m_serviceManager;
@@ -75,33 +75,32 @@
public void service( final ServiceManager serviceManager ) throws ServiceException
{
- m_logger.info("service");
+ m_logger.info( "service" );
m_serviceManager = serviceManager;
}
public void initialize() throws Exception
{
- m_logger.warn("initialize");
+ m_logger.warn( "initialize" );
m_initialized = true;
}
- public void contextualize(Context context) throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
- m_logger.error("contextualize");
+ m_logger.error( "contextualize" );
m_context = context;
}
- public void enableLogging(Logger logger)
+ public void enableLogging( Logger logger )
{
m_logger = logger;
}
- public void configure(Configuration configuration) throws ConfigurationException
+ public void configure( Configuration configuration ) throws ConfigurationException
{
- m_logger.fatalError("configure");
+ m_logger.fatalError( "configure" );
m_configuration = configuration;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org