cocoon-dev 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/processor/xsp/language/java XSPJavaProcessor.java
Date Thu, 13 Apr 2000 10:42:58 GMT
stefano     00/04/13 03:42:58

  Modified:    src/org/apache/cocoon/processor/xsp XSPUtil.java
               src/org/apache/cocoon/processor/xsp/language/java
                        XSPJavaProcessor.java
  Log:
  fixed problems with package generations
  
  Revision  Changes    Path
  1.15      +7 -3      xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPUtil.java
  
  Index: XSPUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPUtil.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XSPUtil.java	2000/03/19 00:59:33	1.14
  +++ XSPUtil.java	2000/04/13 10:42:56	1.15
  @@ -1,4 +1,4 @@
  -/*-- $Id: XSPUtil.java,v 1.14 2000/03/19 00:59:33 stefano Exp $ --
  +/*-- $Id: XSPUtil.java,v 1.15 2000/04/13 10:42:56 stefano Exp $ --
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -62,7 +62,7 @@
   
   /**
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version $Revision: 1.14 $ $Date: 2000/03/19 00:59:33 $
  + * @version $Revision: 1.15 $ $Date: 2000/04/13 10:42:56 $
    */
   public class XSPUtil {
     public static String pathComponent(String filename) {
  @@ -90,7 +90,11 @@
     }
   
     public static String normalizedBaseName(String filename) {
  -    filename = baseName(filename);
  +     filename = baseName(filename);
  +     return normalizedName(filename);
  +  }
  +
  +  public static String normalizedName(String filename) {
       String[] path = split(filename, File.separator);
       int start = (path[0].length() == 0) ? 1 : 0;
   
  
  
  
  1.7       +4 -5      xml-cocoon/src/org/apache/cocoon/processor/xsp/language/java/XSPJavaProcessor.java
  
  Index: XSPJavaProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/language/java/XSPJavaProcessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSPJavaProcessor.java	2000/02/13 18:29:37	1.6
  +++ XSPJavaProcessor.java	2000/04/13 10:42:57	1.7
  @@ -1,4 +1,4 @@
  -/*-- $Id: XSPJavaProcessor.java,v 1.6 2000/02/13 18:29:37 stefano Exp $ --
  +/*-- $Id: XSPJavaProcessor.java,v 1.7 2000/04/13 10:42:57 stefano Exp $ --
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -62,7 +62,7 @@
   
   /**
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version $Revision: 1.6 $ $Date: 2000/02/13 18:29:37 $
  + * @version $Revision: 1.7 $ $Date: 2000/04/13 10:42:57 $
    */
   public class XSPJavaProcessor implements XSPLanguageProcessor {
     // Create class loader
  @@ -170,10 +170,9 @@
   
     public static String packageName(String filename) {
       return
  -      XSPUtil.normalizedBaseName(
  +      XSPUtil.normalizedName(
           XSPUtil.pathComponent(filename)
  -      )
  -      .replace(File.separatorChar, '.');
  +      ).replace(File.separatorChar, '.');
     }
   
     public String stringEncode(String string) {
  
  
  

Mime
View raw message