cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/programming/java JavaLanguage.java
Date Tue, 19 Sep 2000 00:27:22 GMT
stefano     00/09/18 17:27:21

  Modified:    src/org/apache/cocoon/components/language/programming Tag:
                        xml-cocoon2 CompiledProgrammingLanguage.java
               src/org/apache/cocoon/components/language/programming/java
                        Tag: xml-cocoon2 JavaLanguage.java
  Log:
  added the ability to receive the classpath from the Cocoon component
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +6 -1      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
  
  Index: CompiledProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- CompiledProgrammingLanguage.java	2000/09/06 23:22:23	1.1.2.6
  +++ CompiledProgrammingLanguage.java	2000/09/19 00:27:14	1.1.2.7
  @@ -15,6 +15,7 @@
   import org.apache.avalon.Component;
   import org.apache.avalon.ComponentManager;
   
  +import org.apache.cocoon.Cocoon;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.components.language.LanguageException;
   
  @@ -24,7 +25,7 @@
    * and object program files
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/09/06 23:22:23 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/19 00:27:14 $
    */
   public abstract class CompiledProgrammingLanguage
     extends AbstractProgrammingLanguage
  @@ -36,6 +37,9 @@
     /** The component manager */
     protected ComponentManager manager;
   
  +  /** The local classpath */
  +  protected String classpath;
  +
     /** The source deletion option */
     protected boolean deleteSources = false;
   
  @@ -68,6 +72,7 @@
      */
     public void setComponentManager(ComponentManager manager) {
       this.manager = manager;
  +    this.classpath = ((Cocoon) this.manager.getComponent("cocoon")).getClasspath();
     }
   
     /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +3 -6      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.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- JavaLanguage.java	2000/09/06 23:22:23	1.1.2.6
  +++ JavaLanguage.java	2000/09/19 00:27:17	1.1.2.7
  @@ -27,7 +27,7 @@
    * The Java programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/09/06 23:22:23 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/19 00:27:17 $
    */
   public class JavaLanguage extends CompiledProgrammingLanguage {
       
  @@ -145,11 +145,8 @@
       
         compiler.setDestination(baseDirectory);
       
  -      compiler.setClasspath(
  -        System.getProperty("java.class.path") + File.pathSeparator +
  -        baseDirectory
  -      );
  -    
  +      compiler.setClasspath(classpath + File.pathSeparator + baseDirectory);
  +      
         if (encoding != null) {
           compiler.setEncoding(encoding);
         }
  
  
  

Mime
View raw message