dims 01/04/25 14:02:18
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractValidatorAction.java
DatabaseAuthenticatorAction.java
FormValidatorAction.java
SessionInvalidatorAction.java
SessionPropagatorAction.java
SessionValidatorAction.java
src/org/apache/cocoon/components/language/markup/sitemap
Tag: xml-cocoon2 SitemapMarkupLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 AbstractJavaCompiler.java
JavaLanguage.java Javac.java Jikes.java
JstyleFormatter.java
src/org/apache/cocoon/components/language/programming/javascript
Tag: xml-cocoon2 JavascriptLanguage.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
ImageDirectoryGenerator.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
SVGSerializer.java
Log:
Cleanup imports a bit.
Revision Changes Path
No revision
No revision
1.1.2.5 +5 -12
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractValidatorAction.java 2001/04/25 17:05:04 1.1.2.4
+++ AbstractValidatorAction.java 2001/04/25 21:01:44 1.1.2.5
@@ -1,17 +1,10 @@
-// $Id: AbstractValidatorAction.java,v 1.1.2.4 2001/04/25 17:05:04 donaldp
Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.5 2001/04/25 21:01:44 dims Exp $
package org.apache.cocoon.acting;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
-import org.apache.cocoon.util.Tokenizer;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.log.Logger;
/**
* Abstract implementation of action that needs to perform validation of
@@ -48,7 +41,7 @@
* octal values as accepted by java.Lang.decode (String s).
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 17:05:04 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 21:01:44 $
*/
public abstract class AbstractValidatorAction
extends AbstractComplementaryConfigurableAction
@@ -287,5 +280,5 @@
}
}
-// $Id: AbstractValidatorAction.java,v 1.1.2.4 2001/04/25 17:05:04 donaldp
Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.5 2001/04/25 21:01:44 dims Exp $
// vim: set et ts=4 sw=4:
1.1.2.8 +6 -9
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- DatabaseAuthenticatorAction.java 2001/04/25 17:05:06 1.1.2.7
+++ DatabaseAuthenticatorAction.java 2001/04/25 21:01:46 1.1.2.8
@@ -1,24 +1,21 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.7 2001/04/25 17:05:06
donaldp Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.8 2001/04/25 21:01:46 dims
Exp $
package org.apache.cocoon.acting;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Timestamp;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.util.Tokenizer;
import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
* This action is used to authenticate user by comparing several request
@@ -53,7 +50,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:05:06 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 21:01:46 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
{
@@ -226,5 +223,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.7 2001/04/25 17:05:06
donaldp Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.8 2001/04/25 21:01:46 dims
Exp $
// vim: set et ts=4 sw=4:
1.1.2.6 +6 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FormValidatorAction.java 2001/04/25 17:05:08 1.1.2.5
+++ FormValidatorAction.java 2001/04/25 21:01:46 1.1.2.6
@@ -1,17 +1,17 @@
-// $Id: FormValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:08 donaldp Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:46 dims Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.Tokenizer;
+import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
* This is the action used to validate HTTP form parameters supplied via
@@ -32,7 +32,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:05:08 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 21:01:46 $
*/
public class FormValidatorAction extends AbstractValidatorAction
{
@@ -82,5 +82,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:08 donaldp Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:46 dims Exp $
// vim: set et ts=4 sw=4:
1.1.2.7 +6 -8
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SessionInvalidatorAction.java 2001/04/25 17:05:12 1.1.2.6
+++ SessionInvalidatorAction.java 2001/04/25 21:01:47 1.1.2.7
@@ -1,25 +1,23 @@
-// $Id: SessionInvalidatorAction.java,v 1.1.2.6 2001/04/25 17:05:12 donaldp
Exp $
+// $Id: SessionInvalidatorAction.java,v 1.1.2.7 2001/04/25 21:01:47 dims Exp
$
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.util.Tokenizer;
+import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
* This is the action used to invalidate an HTTP session. The action returns
* empty map if everything is ok, null otherwise.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:05:12 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 21:01:47 $
*/
public class SessionInvalidatorAction extends AbstractAction
{
@@ -51,5 +49,5 @@
}
}
-// $Id: SessionInvalidatorAction.java,v 1.1.2.6 2001/04/25 17:05:12 donaldp
Exp $
+// $Id: SessionInvalidatorAction.java,v 1.1.2.7 2001/04/25 21:01:47 dims Exp
$
// vim: set et ts=4 sw=4:
1.1.2.3 +6 -8
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SessionPropagatorAction.java 2001/04/25 17:05:12 1.1.2.2
+++ SessionPropagatorAction.java 2001/04/25 21:01:48 1.1.2.3
@@ -1,19 +1,17 @@
-// $Id: SessionPropagatorAction.java,v 1.1.2.2 2001/04/25 17:05:12 donaldp
Exp $
+// $Id: SessionPropagatorAction.java,v 1.1.2.3 2001/04/25 21:01:48 dims Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.util.Tokenizer;
+import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
* This is the action used to propagate parameters into session. It
@@ -29,7 +27,7 @@
* </pre>
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:05:12 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 21:01:48 $
*/
public class SessionPropagatorAction extends ComposerAction
{
@@ -79,6 +77,6 @@
}
}
-// $Id: SessionPropagatorAction.java,v 1.1.2.2 2001/04/25 17:05:12 donaldp
Exp $
+// $Id: SessionPropagatorAction.java,v 1.1.2.3 2001/04/25 21:01:48 dims Exp $
// vim: set et ts=4 sw=4:
1.1.2.6 +6 -7
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SessionValidatorAction.java 2001/04/25 17:05:13 1.1.2.5
+++ SessionValidatorAction.java 2001/04/25 21:01:49 1.1.2.6
@@ -1,19 +1,18 @@
-// $Id: SessionValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:13 donaldp
Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:49 dims Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.parameters.Parameters;
-import org.apache.cocoon.*;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.Tokenizer;
+import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
@@ -35,7 +34,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:05:13 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 21:01:49 $
*/
public class SessionValidatorAction extends AbstractValidatorAction
{
@@ -86,5 +85,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.1.2.5 2001/04/25 17:05:13 donaldp
Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:49 dims Exp $
// vim: set et ts=4 sw=4:
No revision
No revision
1.1.2.18 +5 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java
Index: SitemapMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- SitemapMarkupLanguage.java 2001/04/25 17:05:42 1.1.2.17
+++ SitemapMarkupLanguage.java 2001/04/25 21:01:58 1.1.2.18
@@ -9,15 +9,17 @@
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.logger.Loggable;
-import org.apache.cocoon.components.language.markup.*;
-import org.apache.cocoon.components.language.markup.sitemap.*;
+import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
+import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.log.Logger;
import org.xml.sax.Attributes;
@@ -33,7 +35,7 @@
* <a href="http://xml.apache.org/cocoon/sitemap.html";>Sitemap</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:05:42 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 21:01:58 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.1.2.14 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- AbstractJavaCompiler.java 2001/04/25 17:06:03 1.1.2.13
+++ AbstractJavaCompiler.java 2001/04/25 21:02:00 1.1.2.14
@@ -14,13 +14,13 @@
import java.io.InputStreamReader;
import java.util.List;
import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cocoon.components.language.programming.*;
+import org.apache.cocoon.components.language.programming.LanguageCompiler;
import org.apache.excalibur.pool.Recyclable;
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:06:03 $
+ * @version $Revision: 1.1.2.14 $ $Date: 2001/04/25 21:02:00 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler extends AbstractLoggable
implements LanguageCompiler, Recyclable {
1.1.2.29 +6 -3
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- JavaLanguage.java 2001/04/25 17:06:04 1.1.2.28
+++ JavaLanguage.java 2001/04/25 21:02:01 1.1.2.29
@@ -9,13 +9,13 @@
package org.apache.cocoon.components.language.programming.java;
import java.io.File;
-import java.io.FileFilter;
import java.io.IOException;
import java.util.List;
import org.apache.avalon.activity.Disposable;
import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.Composable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.logger.Loggable;
import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.thread.ThreadSafe;
@@ -23,15 +23,18 @@
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.components.language.programming.*;
+import
org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
+import org.apache.cocoon.components.language.programming.CompilerError;
+import org.apache.cocoon.components.language.programming.LanguageCompiler;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.JavaArchiveFilter;
+import org.apache.log.Logger;
/**
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/25 17:06:04 $
+ * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/25 21:02:01 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
1.1.2.13 +12 -4
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- Javac.java 2001/02/08 21:37:45 1.1.2.12
+++ Javac.java 2001/04/25 21:02:02 1.1.2.13
@@ -8,17 +8,25 @@
package org.apache.cocoon.components.language.programming.java;
-import java.io.*;
-import java.util.*;
-import org.apache.cocoon.components.language.programming.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import org.apache.cocoon.components.language.programming.CompilerError;
import org.apache.cocoon.util.ClassUtils;
import org.apache.log.LogKit;
+import org.apache.log.Logger;
+import sun.tools.javac.Main;
/**
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.12 $ $Date: 2001/02/08 21:37:45 $
+ * @version $Revision: 1.1.2.13 $ $Date: 2001/04/25 21:02:02 $
* @since 2.0
*/
1.1.2.12 +13 -4
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- Jikes.java 2001/04/24 08:41:04 1.1.2.11
+++ Jikes.java 2001/04/25 21:02:02 1.1.2.12
@@ -8,15 +8,24 @@
package org.apache.cocoon.components.language.programming.java;
-import java.io.*;
-import java.util.*;
-import org.apache.cocoon.components.language.programming.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.cocoon.components.language.programming.CompilerError;
+import org.apache.log.Logger;
/**
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.11 $ $Date: 2001/04/24 08:41:04 $
+ * @version $Revision: 1.1.2.12 $ $Date: 2001/04/25 21:02:02 $
* @since 2.0
*/
1.1.2.9 +3 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- JstyleFormatter.java 2001/04/25 17:06:05 1.1.2.8
+++ JstyleFormatter.java 2001/04/25 21:02:03 1.1.2.9
@@ -15,7 +15,8 @@
import jstyle.JSBeautifier;
import jstyle.JSFormatter;
import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cocoon.components.language.programming.*;
+import org.apache.cocoon.components.language.programming.CodeFormatter;
+import org.apache.log.Logger;
/**
* This class implements <code>CodeFormatter</code> based on
@@ -23,7 +24,7 @@
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:06:05 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 21:02:03 $
*/
public class JstyleFormatter extends AbstractLoggable implements
CodeFormatter {
/**
No revision
No revision
1.1.2.8 +5 -3
xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java
Index: JavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- JavascriptLanguage.java 2001/04/25 17:06:08 1.1.2.7
+++ JavascriptLanguage.java 2001/04/25 21:02:08 1.1.2.8
@@ -8,16 +8,18 @@
package org.apache.cocoon.components.language.programming.javascript;
import java.io.File;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.components.language.programming.java.*;
-import org.mozilla.javascript.*;
+import
org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
+import org.apache.cocoon.components.language.programming.java.JavaLanguage;
+import org.apache.log.Logger;
import org.mozilla.javascript.tools.jsc.Main;
/**
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:08 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 21:02:08 $
*/
public class JavascriptLanguage extends JavaLanguage
{
No revision
No revision
1.1.2.10 +9 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ImageDirectoryGenerator.java 2001/04/25 18:20:39 1.1.2.9
+++ ImageDirectoryGenerator.java 2001/04/25 21:02:12 1.1.2.10
@@ -7,17 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.log.LogKit;
+import org.apache.log.Logger;
import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* An extension of DirectoryGenerators that adds extra attributes for image
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
- * @version $Revision: 1.1.2.9 $ $Date: 2001/04/25 18:20:39 $
+ * @version $Revision: 1.1.2.10 $ $Date: 2001/04/25 21:02:12 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
No revision
No revision
1.1.2.35 +16 -15
xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -r1.1.2.34 -r1.1.2.35
--- SVGSerializer.java 2001/04/25 17:54:26 1.1.2.34
+++ SVGSerializer.java 2001/04/25 21:02:16 1.1.2.35
@@ -8,40 +8,41 @@
package org.apache.cocoon.serialization;
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
-import java.util.Iterator;
-import org.apache.avalon.component.ComponentException;
+import java.awt.Color;
+import java.io.BufferedOutputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.batik.transcoder.*;
-import org.apache.cocoon.*;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.TranscodingHints;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
-import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
import org.apache.cocoon.components.transcoder.TranscoderFactory;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.*;
-import org.apache.cocoon.xml.dom.*;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.dom.SVGBuilder;
import org.apache.excalibur.pool.Poolable;
-import org.w3c.dom.*;
-import org.w3c.dom.svg.*;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+import org.apache.log.Logger;
+import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
/**
* A Batik based Serializer for generating PNG/JPEG images
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.1.2.34 $ $Date: 2001/04/25 17:54:26 $
+ * @version CVS $Revision: 1.1.2.35 $ $Date: 2001/04/25 21:02:16 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable
{
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
