mcconnell 2002/11/19 11:17:47
Modified: meta/src/java/org/apache/excalibur/meta/info/builder
ServiceBuilder.java TypeBuilder.java
XMLBlockCreator.java XMLServiceCreator.java
XMLTypeCreator.java
meta/src/java/org/apache/excalibur/meta/model/verifier
ProfileVerifier.java
meta/src/java/org/apache/excalibur/meta/verifier
ComponentVerifier.java
meta/src/xdocs profile.xml
Log:
Applied patch from Gary Shea - correction to context directive documentation.
Revision Changes Path
1.8 +1 -18
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/ServiceBuilder.java
Index: ServiceBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/ServiceBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceBuilder.java 18 Nov 2002 13:01:03 -0000 1.7
+++ ServiceBuilder.java 19 Nov 2002 19:17:47 -0000 1.8
@@ -58,8 +58,6 @@
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;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.meta.info.Service;
/**
@@ -73,27 +71,12 @@
* @version $Revision$ $Date$
*/
public final class ServiceBuilder
- extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( ServiceBuilder.class );
private final ServiceCreator m_xmlServiceCreator =
createXMLServiceCreator();
private final ServiceCreator m_serialServiceCreator = new
SerializedServiceCreator();
-
- /**
- * Setup logging for all subcomponents
- * @param logger the logging channel
- */
- public void enableLogging( final Logger logger )
- {
- super.enableLogging( logger );
- setupLogger( m_serialServiceCreator );
- if( null != m_xmlServiceCreator )
- {
- setupLogger( m_xmlServiceCreator );
- }
- }
/**
* Create a [EMAIL PROTECTED] Service} object for specified Class.
1.7 +1 -16
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/TypeBuilder.java
Index: TypeBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/TypeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TypeBuilder.java 23 Oct 2002 16:34:47 -0000 1.6
+++ TypeBuilder.java 19 Nov 2002 19:17:47 -0000 1.7
@@ -75,27 +75,12 @@
* @version $Revision$ $Date$
*/
public final class TypeBuilder
- extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( TypeBuilder.class );
private final TypeCreator m_xmlTypeCreator = createXMLTypeCreator();
private final TypeCreator m_serialTypeCreator = new
SerializedTypeCreator();
-
- /**
- * Setup logging for all subcomponents
- * @param logger the logging channel
- */
- public void enableLogging( final Logger logger )
- {
- super.enableLogging( logger );
- setupLogger( m_serialTypeCreator );
- if( null != m_xmlTypeCreator )
- {
- setupLogger( m_xmlTypeCreator );
- }
- }
/**
* Create a [EMAIL PROTECTED] Type} object for specified Class.
1.9 +3 -37
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLBlockCreator.java
Index: XMLBlockCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLBlockCreator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLBlockCreator.java 18 Nov 2002 11:23:46 -0000 1.8
+++ XMLBlockCreator.java 19 Nov 2002 19:17:47 -0000 1.9
@@ -126,14 +126,6 @@
private Type build( final String classname, final Configuration info )
throws Exception
{
- if( getLogger().isDebugEnabled() )
- {
- final String message =
- REZ.getString( "builder.creating-info.notice",
- classname );
- getLogger().debug( message );
- }
-
final String topLevelName = info.getName();
if( !topLevelName.equals( "type" ) )
{
@@ -171,20 +163,6 @@
configuration = info.getChild( "extensions" );
final ExtensionDescriptor[] extensions = buildExtensions(
configuration );
- if( getLogger().isInfoEnabled() )
- {
- final String message =
- REZ.getString( "builder.created-facility.notice",
- classname,
- new Integer( services.length ),
- new Integer( dependencies.length ),
- new Integer( context.getEntrys().length ),
- new Integer( loggers.length ),
- new Integer( phases.length ),
- new Integer( extensions.length ) );
- getLogger().debug( message );
- }
-
return new Type(
descriptor, loggers, context, services, dependencies, phases,
extensions );
}
@@ -269,23 +247,11 @@
buildAttributes( dependency.getChild( "attributes" ) );
String role = dependency.getChild( "role" ).getValue( null );
- //default to name of service if role unspecified
+ // default to name of service if role unspecified
+
if( null == role )
{
role = service.getClassname();
- }
- else
- {
- //If role is specified and it is the same as
- //service name then warn that it is redundent.
- if( role.equals( service.getClassname() ) )
- {
- final String message =
- REZ.getString( "builder.redundent-role.notice",
- classname,
- role );
- getLogger().warn( message );
- }
}
return new DependencyDescriptor( role, service, optional, attributes
);
1.10 +1 -19
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLServiceCreator.java
Index: XMLServiceCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLServiceCreator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLServiceCreator.java 18 Nov 2002 13:01:03 -0000 1.9
+++ XMLServiceCreator.java 19 Nov 2002 19:17:47 -0000 1.10
@@ -75,7 +75,6 @@
* @version $Revision$ $Date$
*/
public class XMLServiceCreator
- extends AbstractLogEnabled
implements ServiceCreator
{
private static final Resources REZ =
@@ -114,14 +113,6 @@
private Service build( final String classname, final Configuration info )
throws Exception
{
- if( getLogger().isDebugEnabled() )
- {
- final String message =
- REZ.getString( "builder.creating-service.notice",
- classname );
- getLogger().debug( message );
- }
-
final String topLevelName = info.getName();
if( !topLevelName.equals( "service" ) )
{
@@ -136,15 +127,6 @@
buildAttributes( info.getChild( "attributes" ) );
final String versionString = info.getChild( "version" ).getValue(
"1.0" );
final Version version = buildVersion( versionString );
-
- if( getLogger().isInfoEnabled() )
- {
- final String message =
- REZ.getString( "builder.created-service.notice",
- classname,
- new Integer( attributes.size() ) );
- getLogger().debug( message );
- }
return new Service( classname, version, attributes );
}
1.15 +1 -37
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLTypeCreator.java 18 Nov 2002 11:23:46 -0000 1.14
+++ XMLTypeCreator.java 19 Nov 2002 19:17:47 -0000 1.15
@@ -129,14 +129,6 @@
private Type build( final String classname, final Configuration info )
throws Exception
{
- if( getLogger().isDebugEnabled() )
- {
- final String message =
- REZ.getString( "builder.creating-info.notice",
- classname );
- getLogger().debug( message );
- }
-
final String topLevelName = info.getName();
if( !topLevelName.equals( "type" ) )
{
@@ -182,20 +174,6 @@
configuration = info.getChild( "extensions" );
final ExtensionDescriptor[] extensions = buildExtensions(
configuration );
- if( getLogger().isInfoEnabled() )
- {
- final String message =
- REZ.getString( "builder.created-facility.notice",
- classname,
- new Integer( services.length ),
- new Integer( dependencies.length ),
- new Integer( context.getEntrys().length ),
- new Integer( loggers.length ),
- new Integer( phases.length ),
- new Integer( extensions.length ) );
- getLogger().debug( message );
- }
-
return new Type(
descriptor, loggers, context, services, dependencies, phases,
extensions );
}
@@ -335,20 +313,6 @@
if( null == role )
{
role = service.getClassname();
- }
- else
- {
- //If role is specified and it is the same as
- //service name then warn that it is redundent.
-
- if( role.equals( service.getClassname() ) )
- {
- final String message =
- REZ.getString( "builder.redundent-role.notice",
- classname,
- role );
- getLogger().warn( message );
- }
}
return new DependencyDescriptor( role, service, optional, attributes
);
1.4 +1 -12
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/model/verifier/ProfileVerifier.java
Index: ProfileVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/model/verifier/ProfileVerifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfileVerifier.java 18 Nov 2002 13:01:03 -0000 1.3
+++ ProfileVerifier.java 19 Nov 2002 19:17:47 -0000 1.4
@@ -92,7 +92,6 @@
* @version $Revision$ $Date$
*/
public class ProfileVerifier
- extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( ProfileVerifier.class );
@@ -122,16 +121,6 @@
}
m_verifier = verifier;
- }
-
- /**
- * Assign a logging channel to the verifier.
- * @param logger the logging channel
- */
- public void enableLogging( final Logger logger )
- {
- super.enableLogging( logger );
- setupLogger( m_verifier );
}
/**
1.6 +1 -14
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/verifier/ComponentVerifier.java
Index: ComponentVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/verifier/ComponentVerifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentVerifier.java 23 Oct 2002 16:34:47 -0000 1.5
+++ ComponentVerifier.java 19 Nov 2002 19:17:47 -0000 1.6
@@ -83,7 +83,6 @@
* @version $Revision$ $Date$
*/
public class ComponentVerifier
- extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( ComponentVerifier.class );
@@ -300,7 +299,6 @@
REZ.getString( "verifier.incompat-serviceable.error",
name,
implementation.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
@@ -316,7 +314,6 @@
REZ.getString( "verifier.incompat-config.error",
name,
implementation.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -340,7 +337,6 @@
REZ.getString( "verifier.non-interface-service.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -366,7 +362,6 @@
REZ.getString( "verifier.non-public-service.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -394,7 +389,6 @@
name,
clazz.getName(),
lifecycle.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -422,7 +416,6 @@
REZ.getString( "verifier.non-public-ctor.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -432,7 +425,6 @@
REZ.getString( "verifier.missing-noargs-ctor.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -458,7 +450,6 @@
REZ.getString( "verifier.abstract-class.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -484,7 +475,6 @@
REZ.getString( "verifier.nonpublic-class.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -508,7 +498,6 @@
REZ.getString( "verifier.primitive-class.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -532,7 +521,6 @@
REZ.getString( "verifier.interface-class.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
@@ -556,7 +544,6 @@
REZ.getString( "verifier.array-class.error",
name,
clazz.getName() );
- getLogger().error( message );
throw new VerifyException( message );
}
}
1.2 +2 -2 jakarta-avalon-excalibur/meta/src/xdocs/profile.xml
Index: profile.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/meta/src/xdocs/profile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- profile.xml 11 Nov 2002 11:58:47 -0000 1.1
+++ profile.xml 19 Nov 2002 19:17:47 -0000 1.2
@@ -63,7 +63,7 @@
--></i></font>
<context>
- <entry name="<font color="darkred">location</font>" value="<font
color="darkred">Paris</font>"/>
+ <entry name="<font color="darkred">location</font>"><font
color="darkred">Paris</font>"</entry>
</context>
<font color="gray"><i><!--
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
