cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/language/markup CocoonMarkupLanguage.java
Date Mon, 29 Dec 2003 13:31:33 GMT
unico       2003/12/29 05:31:33

  Modified:    src/java/org/apache/cocoon/components/language/programming/javascript
                        JavascriptLanguage.java
               src/java/org/apache/cocoon/components/language/programming/java
                        JavaLanguage.java
               src/java/org/apache/cocoon/components/language/markup/xsp
                        XSPMarkupLanguage.java
               src/java/org/apache/cocoon/components/language/markup
                        CocoonMarkupLanguage.java
  Log:
  meta infos
  
  Revision  Changes    Path
  1.3       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java
  
  Index: JavascriptLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavascriptLanguage.java	7 Oct 2003 15:13:20 -0000	1.2
  +++ JavascriptLanguage.java	29 Dec 2003 13:31:33 -0000	1.3
  @@ -74,6 +74,11 @@
    *
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=ProgrammingLanguage
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=javascript-language
    */
   public class JavascriptLanguage extends AbstractProgrammingLanguage implements ProgrammingLanguage
{
   
  
  
  
  1.4       +19 -15    cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
  
  Index: JavaLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaLanguage.java	7 Oct 2003 15:13:20 -0000	1.3
  +++ JavaLanguage.java	29 Dec 2003 13:31:33 -0000	1.4
  @@ -50,43 +50,47 @@
   */
   package org.apache.cocoon.components.language.programming.java;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.List;
  +import java.util.StringTokenizer;
  +
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.avalon.framework.logger.LogEnabled;
  -
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.components.classloader.ClassLoaderManager;
   import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.programming.LanguageCompiler;
   import org.apache.cocoon.components.language.markup.xsp.XSLTExtension;
   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.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.JavaArchiveFilter;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.List;
  -import java.util.StringTokenizer;
  -
   /**
    * The Java programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=ProgrammingLanguage
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=java-language
    */
   public class JavaLanguage extends CompiledProgrammingLanguage
  -        implements Initializable, ThreadSafe, Composable, Disposable {
  +        implements ProgrammingLanguage, Initializable, Serviceable, Disposable {
   
       /** The class loader */
       private ClassLoaderManager classLoaderManager;
   
       /** The component manager */
  -    protected ComponentManager manager = null;
  +    protected ServiceManager manager = null;
   
       /** Classpath */
       private String classpath;
  @@ -136,7 +140,7 @@
        *
        * @param manager The global component manager
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
           if (this.classLoaderManager == null) {
               try {
  
  
  
  1.3       +8 -4      cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
  
  Index: XSPMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSPMarkupLanguage.java	22 May 2003 13:02:47 -0000	1.2
  +++ XSPMarkupLanguage.java	29 Dec 2003 13:31:33 -0000	1.3
  @@ -50,16 +50,15 @@
   */
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import java.util.Stack;
  +
   import org.apache.cocoon.components.language.markup.CocoonMarkupLanguage;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.xml.AbstractXMLPipe;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
   
  -import java.util.Stack;
  -
   /**
    * This class implements <code>MarkupLanguage</code> for Cocoon's
    * <a href="http://cocoon.apache.org/userdocs/xsp/">XSP</a>.
  @@ -68,6 +67,11 @@
    * @author <a href="mailto:ssahuc@apache.org">Sebastien Sahuc</a>
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=MarkupLanguage
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=xsp-markup
    */
   public class XSPMarkupLanguage extends CocoonMarkupLanguage {
   
  
  
  
  1.5       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
  
  Index: CocoonMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CocoonMarkupLanguage.java	6 Dec 2003 21:22:10 -0000	1.4
  +++ CocoonMarkupLanguage.java	29 Dec 2003 13:31:33 -0000	1.5
  @@ -83,6 +83,11 @@
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
    * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=MarkupLanguage
  + * @x-avalon.lifestyle type=singleton
  + * @x-avalon.info name=sitemap-markup
    */
   public abstract class CocoonMarkupLanguage extends AbstractMarkupLanguage
   {
  
  
  

Mime
View raw message