cziegeler 01/10/15 06:40:55
Modified: src/org/apache/cocoon/components/language/markup/xsp
XSPObjectHelper.java
src/org/apache/cocoon/components/saxconnector
LoggingSAXConnector.java
src/org/apache/cocoon/reading DatabaseReader.java
src/org/apache/cocoon/samples/parentcm Configurator.java
Generator.java ParentComponentManager.java
src/org/apache/cocoon/transformation
AbstractDOMTransformer.java
Log:
Fixing mailto: links
Revision Changes Path
1.8 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Index: XSPObjectHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPObjectHelper.java 2001/10/11 07:20:26 1.7
+++ XSPObjectHelper.java 2001/10/15 13:40:55 1.8
@@ -22,9 +22,9 @@
* Base class for XSP's object model manipulation logicsheets
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* (Cocoon1 <code>xspExpr()</code> methods port)
- * @version CVS $Revision: 1.7 $ $Date: 2001/10/11 07:20:26 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/15 13:40:55 $
*/
public class XSPObjectHelper {
/**
1.7 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java
Index: LoggingSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggingSAXConnector.java 2001/10/11 07:28:19 1.6
+++ LoggingSAXConnector.java 2001/10/15 13:40:55 1.7
@@ -26,8 +26,8 @@
/**
* This SAX connector logs all intermediate sax streams to the log.
- * @author <a href="[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/11 07:28:19 $
+ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/15 13:40:55 $
*/
public class LoggingSAXConnector
extends AbstractXMLPipe
1.10 +1 -1
xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatabaseReader.java 2001/10/11 07:28:22 1.9
+++ DatabaseReader.java 2001/10/15 13:40:55 1.10
@@ -40,7 +40,7 @@
* the Connection to use, parameters specify the table and column
* to pull the image from, and source specifies the source key information.
*
- * @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
*/
public class DatabaseReader extends AbstractReader implements Composable,
Configurable, Disposable, Cacheable, Poolable {
private ComponentSelector dbselector;
1.4 +5 -5
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java
Index: Configurator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Configurator.java 2001/10/11 07:28:22 1.3
+++ Configurator.java 2001/10/15 13:40:55 1.4
@@ -14,7 +14,7 @@
* <p>
* The configuration is bound to
<code>org/apache/cocoon/samples/parentcm/ParentCMConfiguration</code>.
*
- * @author <a href="[EMAIL PROTECTED]">Leo Sutic</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
*/
public class Configurator {
@@ -24,7 +24,7 @@
* as a static member to avoid passing it around.
*/
public static Context initialContext = null;
-
+
static {
try {
//
@@ -36,14 +36,14 @@
timeComponent.addAttribute("default-class",
TimeComponent.class.getName());
timeComponent.addAttribute("shorthand", "samples-parentcm-time");
config.addChild(timeComponent);
-
+
//
// Bind it - get an initial context.
//
Hashtable environment = new Hashtable();
environment.put(Context.INITIAL_CONTEXT_FACTORY,
MemoryInitialContextFactory.class.getName());
initialContext = new InitialContext(environment);
-
+
//
// Create subcontexts and bind the configuration.
//
@@ -56,6 +56,6 @@
} catch (Exception e) {
e.printStackTrace(System.err);
}
- }
+ }
}
1.4 +9 -9
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Generator.java 2001/10/11 07:28:22 1.3
+++ Generator.java 2001/10/15 13:40:55 1.4
@@ -19,21 +19,21 @@
* Where <code><i>current time</i></code> is the current time as obtained
from the
* <code>Time</code> component.
*
- * @author <a href="[EMAIL PROTECTED]">Leo Sutic</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
*/
public class Generator extends ComposerGenerator implements Poolable {
- /**
+ /**
* Current time.
*/
private Date time;
-
+
/**
* Looks up a <code>Time</code> component and obtains the current time.
*/
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
throws ProcessingException, SAXException, IOException {
-
+
Time timeGiver = null;
try {
timeGiver = (Time) manager.lookup(Time.ROLE);
@@ -44,7 +44,7 @@
manager.release(timeGiver);
}
}
-
+
/**
* Generate XML data.
*/
@@ -52,15 +52,15 @@
AttributesImpl emptyAttributes = new AttributesImpl();
contentHandler.startDocument();
contentHandler.startElement("", "time", "time", emptyAttributes);
-
+
char[] text = this.time.toString().toCharArray();
-
+
contentHandler.characters(text, 0, text.length);
-
+
contentHandler.endElement("", "time", "time");
contentHandler.endDocument();
}
-
+
/**
* Prepare this object for another cycle.
*/
1.4 +18 -18
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Index: ParentComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParentComponentManager.java 2001/10/11 07:28:22 1.3
+++ ParentComponentManager.java 2001/10/15 13:40:55 1.4
@@ -19,77 +19,77 @@
* given by the initialization parameter in JNDI, use it to configure an
ExcaliburComponentManager
* and delegate any requests to it.
*
- * @author <a href="[EMAIL PROTECTED]">Leo Sutic</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
*/
public class ParentComponentManager implements ComponentManager, Loggable,
Initializable {
-
+
/**
* Our logger.
*/
private Logger logger;
-
+
/**
* The JNDI name where the component manager configuration can be found.
*/
private final String jndiName;
-
+
/**
- * The delegate that will be configured and provide the
+ * The delegate that will be configured and provide the
* functionality for this component manager.
*/
private final ExcaliburComponentManager delegate;
-
+
public ParentComponentManager(final String jndiName) {
this.jndiName = jndiName;
-
+
// Initialize it here so we can let it be final.
this.delegate = new ExcaliburComponentManager();
}
-
+
public boolean hasComponent(final String role) {
return delegate.hasComponent(role);
}
-
+
/**
* Initializes the CM by looking up the configuration object and using
it to
* configure the delegate.
*/
public void initialize() throws Exception {
this.logger.debug("Looking up component manager configuration at : "
+ this.jndiName);
-
+
Hashtable environment = new Hashtable();
environment.put(Context.INITIAL_CONTEXT_FACTORY,
MemoryInitialContextFactory.class.getName());
-
+
//
// Yes, this is cheating, but the Excalibur in-memory naming provider
// is transient. That is, it doesn't store objects persistently and
// is more like a HashMap.
//
- // Should be:
+ // Should be:
// Context initialContext = new InitialContext(environment);
//
Context initialContext = Configurator.initialContext;
-
+
Configuration config = (Configuration)
initialContext.lookup(this.jndiName);
-
+
// We ignore the setRoleManager call, as ExcaliburComponentManager
handles that
// in configure().
this.delegate.setLogger(logger);
this.delegate.contextualize(new DefaultContext());
this.delegate.configure(config);
this.delegate.initialize();
-
+
this.logger.debug("Component manager successfully initialized.");
}
-
+
public Component lookup(final String role) throws ComponentException {
return this.delegate.lookup(role);
}
-
+
public void release(final Component component) {
this.delegate.release(component);
}
-
+
public void setLogger(final Logger logger) {
this.logger = logger;
}
1.8 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractDOMTransformer.java 2001/10/11 07:28:24 1.7
+++ AbstractDOMTransformer.java 2001/10/15 13:40:55 1.8
@@ -34,8 +34,8 @@
* If you need a ComponentManager there is an instance variable
* <code>manager</code> for use.
*
- * @author <A HREF="[EMAIL PROTECTED]">Ross Burton</A>
- * @author <A HREF="[EMAIL PROTECTED]">Bruce G. Robertson</A>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Bruce G. Robertson</a>
* @version CVS $Revision $Date
*/
public abstract class AbstractDOMTransformer extends DOMBuilder
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
