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 2001/11/19 12:47:38 UTC
cvs commit: jakarta-avalon/src/java/org/apache/avalon/framework/context Context.java ContextException.java DefaultContext.java Recontextualizable.java Resolvable.java
donaldp 01/11/19 03:47:38
Modified: src/java/org/apache/avalon/framework/component
ComponentException.java
DefaultComponentManager.java Recomposable.java
src/java/org/apache/avalon/framework/configuration
AbstractConfiguration.java Configurable.java
Configuration.java DefaultConfiguration.java
DefaultConfigurationBuilder.java
DefaultConfigurationSerializer.java
Reconfigurable.java SAXConfigurationHandler.java
src/java/org/apache/avalon/framework/context Context.java
ContextException.java DefaultContext.java
Recontextualizable.java Resolvable.java
Log:
donaldp@apache.org --> peter@apache.org
yea - now no one will call me Donald!!!
Revision Changes Path
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentException.java
Index: ComponentException.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentException.java 2001/05/13 06:37:23 1.2
+++ ComponentException.java 2001/11/19 11:47:37 1.3
@@ -13,7 +13,7 @@
* The exception thrown to indicate a problem with Components.
* It is usually thrown by ComponentManager or ComponentSelector.
*
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
1.7 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultComponentManager.java 2001/07/30 14:17:55 1.6
+++ DefaultComponentManager.java 2001/11/19 11:47:37 1.7
@@ -17,7 +17,7 @@
* Component scope.
*
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultComponentManager
implements ComponentManager
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java
Index: Recomposable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Recomposable.java 2001/05/13 06:37:23 1.2
+++ Recomposable.java 2001/11/19 11:47:37 1.3
@@ -10,7 +10,7 @@
/**
* Extends composer to allow recomposing.
*
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Recomposable
extends Composable
1.9 +2 -2 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java
Index: AbstractConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractConfiguration.java 2001/11/09 21:34:54 1.8
+++ AbstractConfiguration.java 2001/11/19 11:47:37 1.9
@@ -13,9 +13,9 @@
*
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/11/09 21:34:54 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/11/19 11:47:37 $
*/
public abstract class AbstractConfiguration
implements Configuration
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configurable.java
Index: Configurable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configurable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Configurable.java 2001/05/13 06:37:23 1.2
+++ Configurable.java 2001/11/19 11:47:37 1.3
@@ -24,7 +24,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Configurable
{
1.6 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java
Index: Configuration.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Configuration.java 2001/11/11 21:14:46 1.5
+++ Configuration.java 2001/11/19 11:47:37 1.6
@@ -73,7 +73,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Configuration
{
1.9 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfiguration.java
Index: DefaultConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfiguration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultConfiguration.java 2001/11/09 21:34:54 1.8
+++ DefaultConfiguration.java 2001/11/19 11:47:37 1.9
@@ -17,7 +17,7 @@
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultConfiguration
extends AbstractConfiguration
1.10 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationBuilder.java
Index: DefaultConfigurationBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultConfigurationBuilder.java 2001/10/02 16:26:04 1.9
+++ DefaultConfigurationBuilder.java 2001/11/19 11:47:37 1.10
@@ -20,7 +20,7 @@
* A SAXConfigurationBuilder builds configurations via SAX2 compliant parser.
*
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultConfigurationBuilder
{
1.5 +38 -37 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java
Index: DefaultConfigurationSerializer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultConfigurationSerializer.java 2001/10/29 16:16:28 1.4
+++ DefaultConfigurationSerializer.java 2001/11/19 11:47:37 1.5
@@ -8,22 +8,21 @@
package org.apache.avalon.framework.configuration;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.FileOutputStream;
+import java.io.OutputStream;
import java.net.URL;
import java.util.Properties;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.NamespaceSupport;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import javax.xml.transform.OutputKeys;
-import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import java.io.OutputStream;
-
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.NamespaceSupport;
/**
* A ConfigurationSerializer serializes configurations via SAX2 compliant parser.
@@ -32,7 +31,7 @@
*/
public class DefaultConfigurationSerializer
{
- private SAXTransformerFactory m_tfactory = null;
+ private SAXTransformerFactory m_tfactory;
private TransformerHandler m_handler;
private OutputStream m_out;
private Properties m_format = new Properties();
@@ -43,23 +42,25 @@
*/
public DefaultConfigurationSerializer()
{
- this.getTransformerFactory();
+ getTransformerFactory();
}
/**
* Internally set the output strream we will be using.
*/
- protected void setOutputStream(OutputStream out)
+ protected void setOutputStream( final OutputStream out )
{
try
+ {
+ m_out = out;
+ m_handler = getTransformerFactory().newTransformerHandler();
+ m_format.put(OutputKeys.METHOD,"xml");
+ m_handler.setResult(new StreamResult(out));
+ m_handler.getTransformer().setOutputProperties( m_format );
+ }
+ catch( final Exception e )
{
- this.m_out = out;
- this.m_handler = this.getTransformerFactory().newTransformerHandler();
- this.m_format.put(OutputKeys.METHOD,"xml");
- this.m_handler.setResult(new StreamResult(out));
- this.m_handler.getTransformer().setOutputProperties(this.m_format);
- } catch (Exception e) {
- throw new RuntimeException(e.toString());
+ throw new RuntimeException( e.toString() );
}
}
@@ -82,19 +83,19 @@
* be set before calling this method.
*/
protected void serialize( final Configuration source )
- throws SAXException
+ throws SAXException
{
- this.m_namespaceSupport.reset();
- this.m_handler.startDocument();
- this.serializeElement(source);
- this.m_handler.endDocument();
+ m_namespaceSupport.reset();
+ m_handler.startDocument();
+ serializeElement(source);
+ m_handler.endDocument();
}
/**
* Serialize each Configuration element. This method is called recursively.
*/
protected void serializeElement( final Configuration element )
- throws SAXException
+ throws SAXException
{
m_namespaceSupport.pushContext();
@@ -120,8 +121,8 @@
if ( existingURI == null || !existingURI.equals( nsURI ) )
{
nsWasDeclared = true;
- this.m_handler.startPrefixMapping( nsPrefix, nsURI );
- this.m_namespaceSupport.declarePrefix( nsPrefix, nsURI );
+ m_handler.startPrefixMapping( nsPrefix, nsURI );
+ m_namespaceSupport.declarePrefix( nsPrefix, nsURI );
}
String localName = element.getName();
@@ -135,7 +136,7 @@
qName = nsPrefix + ":" + localName;
}
- this.m_handler.startElement(nsURI, localName, qName, attr);
+ m_handler.startElement(nsURI, localName, qName, attr);
String value = element.getValue(null);
@@ -145,22 +146,22 @@
for (int i = 0; i < children.length; i++)
{
- this.serializeElement(children[i]);
+ serializeElement(children[i]);
}
}
else
{
- this.m_handler.characters(value.toCharArray(), 0, value.length());
+ m_handler.characters(value.toCharArray(), 0, value.length());
}
- this.m_handler.endElement(nsURI, localName, qName);
+ m_handler.endElement(nsURI, localName, qName);
if ( nsWasDeclared )
{
- this.m_handler.endPrefixMapping( nsPrefix );
+ m_handler.endPrefixMapping( nsPrefix );
}
- this.m_namespaceSupport.popContext();
+ m_namespaceSupport.popContext();
}
/**
@@ -178,7 +179,7 @@
public void serializeToFile( final File file, final Configuration source )
throws SAXException, IOException, ConfigurationException
{
- this.serialize( new FileOutputStream( file ), source );
+ serialize( new FileOutputStream( file ), source );
}
/**
@@ -189,8 +190,8 @@
{
synchronized(this)
{
- this.setOutputStream( outputStream );
- this.serialize( source );
+ setOutputStream( outputStream );
+ serialize( source );
}
}
@@ -201,6 +202,6 @@
public void serialize( final String uri, final Configuration source )
throws SAXException, IOException, ConfigurationException
{
- this.serialize( new URL( uri ).openConnection().getOutputStream(), source );
+ serialize( new URL( uri ).openConnection().getOutputStream(), source );
}
-}
\ No newline at end of file
+}
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Reconfigurable.java
Index: Reconfigurable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Reconfigurable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Reconfigurable.java 2001/05/04 08:51:33 1.2
+++ Reconfigurable.java 2001/11/19 11:47:37 1.3
@@ -13,7 +13,7 @@
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Reconfigurable
extends Configurable
1.9 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java
Index: SAXConfigurationHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXConfigurationHandler.java 2001/10/29 16:22:15 1.8
+++ SAXConfigurationHandler.java 2001/11/19 11:47:37 1.9
@@ -22,7 +22,7 @@
* A SAXConfigurationHandler helps build Configurations out of sax events.
*
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class SAXConfigurationHandler
extends DefaultHandler
1.2 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/context/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Context.java 2001/04/26 14:16:27 1.1
+++ Context.java 2001/11/19 11:47:38 1.2
@@ -26,7 +26,7 @@
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Context
{
1.2 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/context/ContextException.java
Index: ContextException.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/ContextException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextException.java 2001/04/26 14:16:28 1.1
+++ ContextException.java 2001/11/19 11:47:38 1.2
@@ -17,7 +17,7 @@
* when Component detects a malformed context value.
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class ContextException
extends CascadingException
1.7 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java
Index: DefaultContext.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultContext.java 2001/10/02 18:34:17 1.6
+++ DefaultContext.java 2001/11/19 11:47:38 1.7
@@ -17,7 +17,7 @@
* @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public class DefaultContext
implements Context
1.4 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/context/Recontextualizable.java
Index: Recontextualizable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Recontextualizable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Recontextualizable.java 2001/05/13 06:37:24 1.3
+++ Recontextualizable.java 2001/11/19 11:47:38 1.4
@@ -12,7 +12,7 @@
* This allows a component to re-receive it's context if
* container environment has changed.
*
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Recontextualizable
extends Contextualizable
1.3 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/context/Resolvable.java
Index: Resolvable.java
===================================================================
RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Resolvable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resolvable.java 2001/07/05 13:17:23 1.2
+++ Resolvable.java 2001/11/19 11:47:38 1.3
@@ -11,7 +11,7 @@
* This interface is used to indicate objects that need to be
* resolved in some particular context.
*
- * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
*/
public interface Resolvable
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>