cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giac...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java xsp.xsl
Date Wed, 24 May 2000 22:40:14 GMT
giacomo     00/05/24 15:40:11

  Modified:    .        Tag: xml-cocoon2 build.bat build.sh
               conf     Tag: xml-cocoon2 cocoon.xconf
               samples/documents Tag: xml-cocoon2 simple-page.xsp
               src/org/apache/cocoon/components/language/markup/xsp/java
                        Tag: xml-cocoon2 xsp.xsl
  Added:       conf/WEB-INF Tag: xml-cocoon2 web.xml
  Log:
  Minor fixes to get the new XSP code compile and working easier
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.2  +2 -2      xml-cocoon/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.bat,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- build.bat	2000/03/20 21:22:01	1.10.2.1
  +++ build.bat	2000/05/24 22:39:47	1.10.2.2
  @@ -5,7 +5,7 @@
   
   if "%JAVA_HOME%" == "" goto error
   
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;.\lib\xerces_1_0_3.jar;.\lib\xalan_0_20_0.jar;.\lib\fop_0_12_1.jar;.\lib\servlet_2_2.jar;.\lib\ant.jar;%CLASSPATH%
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;.\lib\xerces_1_0_3.jar;.\lib\xalan_0_20_0.jar;.\lib\fop_0_12_1.jar;.\lib\servlet_2_2.jar;.\lib\ant.jar;.\lib\jstyle.jar;.\lib\svgv_0_8.jar;.\lib\js.jar;%CLASSPATH%
   set ANT_HOME=./lib
   
   echo Building with classpath %LOCALCLASSPATH%
  @@ -24,4 +24,4 @@
   
   :end
   
  -set LOCALCLASSPATH=
  \ No newline at end of file
  +set LOCALCLASSPATH=
  
  
  
  1.10.2.2  +1 -1      xml-cocoon/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.sh,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- build.sh	2000/03/20 21:22:01	1.10.2.1
  +++ build.sh	2000/05/24 22:39:48	1.10.2.2
  @@ -13,7 +13,7 @@
     exit 1
   fi
   
  -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:./lib/xerces_1_0_3.jar:./lib/xalan_0_20_0.jar:./lib/fop_0_12_1.jar:./lib/servlet_2_2.jar:./lib/ant.jar
  +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:./lib/xerces_1_0_3.jar:./lib/xalan_0_20_0.jar:./lib/fop_0_12_1.jar:./lib/servlet_2_2.jar:./lib/jstyle.jar:./lib/svgv_0_8.jar:./lib/js.jar:./lib/ant.jar
   ANT_HOME=./lib
   
   echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +14 -14    xml-cocoon/conf/Attic/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/conf/Attic/cocoon.xconf,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- cocoon.xconf	2000/05/24 20:17:05	1.1.2.3
  +++ cocoon.xconf	2000/05/24 22:39:54	1.1.2.4
  @@ -82,28 +82,18 @@
       
     <sitemap>
       <partition>
  -      <process uri="hello" source="../samples/documents/hello-page.xml">
  +      <process uri="hello" source="samples/documents/hello-page.xml">
           <generator name="file"/>
           <filter name="xslt">
  -          <parameter name="stylesheet" value="../samples/stylesheets/simple-page2html.xsl"/>
  +          <parameter name="stylesheet" value="samples/stylesheets/simple-page2html.xsl"/>
           </filter>
           <serializer name="html">
             <parameter name="contentType" value="text/html"/>
           </serializer>
         </process>
  -      
  -      <process uri="**/" source="**/">
  -        <generator name="directory"/>
  -        <filter name="xslt">
  -          <parameter name="stylesheet" value="../samples/stylesheets/simple-directory2html.xsl"/>
  -        </filter>
  -        <serializer name="html">
  -          <parameter name="contentType" value="text/html"/>
  -        </serializer>
  -      </process>
   
         <!-- Start XSP -->
  -      <process uri="simple-page.xsp" source="../samples/documents/simple-page.xsp">
  +      <process uri="simple-page.xsp" source="samples/documents/simple-page.xsp">
           <generator name="serverpages">
             <!--
             <parameter name="markup-language" value="xsp"/>
  @@ -111,13 +101,23 @@
             -->
           </generator>
           <filter name="xslt">
  -          <parameter name="stylesheet" value="../samples/documents/simple-page.xsl"/>
  +          <parameter name="stylesheet" value="samples/documents/simple-page.xsl"/>
           </filter>
           <serializer name="html">
             <parameter name="contentType" value="text/html"/>
           </serializer>
         </process>
         <!-- End XSP -->
  +      
  +      <process uri="**/" source="**/">
  +        <generator name="directory"/>
  +        <filter name="xslt">
  +          <parameter name="stylesheet" value="samples/stylesheets/simple-directory2html.xsl"/>
  +        </filter>
  +        <serializer name="html">
  +          <parameter name="contentType" value="text/html"/>
  +        </serializer>
  +      </process>
   
       </partition>
     </sitemap>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +23 -0     xml-cocoon/conf/WEB-INF/Attic/web.xml
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-cocoon/samples/documents/Attic/simple-page.xsp
  
  Index: simple-page.xsp
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/samples/documents/Attic/simple-page.xsp,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- simple-page.xsp	2000/05/23 23:09:49	1.1.2.1
  +++ simple-page.xsp	2000/05/24 22:40:03	1.1.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
   <!--
  -<?xml-logicsheet href="../samples/documents/simple-logicsheet.xsl"?>
  +<?xml-logicsheet href="samples/documents/simple-logicsheet.xsl"?>
   -->
   
   <xsp:page
  @@ -11,7 +11,7 @@
             xmlns:xsp-response="http://xml.apache.org/xsp/response"
   >
   
  -  <xsp:logicsheet location="../samples/documents/simple-logicsheet.xsl"/>
  +  <xsp:logicsheet location="samples/documents/simple-logicsheet.xsl"/>
   
     <page>
      <title>A Simple XSP Page</title>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +1 -1      xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl
  
  Index: xsp.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- xsp.xsl	2000/05/23 23:10:00	1.1.2.1
  +++ xsp.xsl	2000/05/24 22:40:08	1.1.2.2
  @@ -60,7 +60,7 @@
           dateCreated = <xsl:value-of select="@creation-date"/>L;
           dependencies = new File[] {
             <xsl:for-each select="xsp:dependency">
  -            new File("<xsl:value-of select="."/>"),
  +            new File("<xsl:value-of select="translate(., '\','/')"/>"),
             </xsl:for-each>
           };
         }
  
  
  

Mime
View raw message