cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: cocoon-2.2/tools/src/anttasks XConfToolTask.java
Date Wed, 26 Nov 2003 06:47:58 GMT
crossley    2003/11/25 22:47:58

  Modified:    src/confpatch cocoon-reload.xweb enable-uploads.xweb
               src/webapp/samples/flow/jxcalc calc.js sitemap.xmap
               src/webapp/samples/test sitemap.xmap
               src/webapp/samples/test/simpletest-mounted sitemap.xmap
               tools/ide/eclipse project
               tools/ide/emacs prj.el.in
               tools/src/anttasks XConfToolTask.java
  Log:
  Gradually fix all dos2unix problems.
  
  Revision  Changes    Path
  1.3       +4 -4      cocoon-2.2/src/confpatch/cocoon-reload.xweb
  
  Index: cocoon-reload.xweb
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/confpatch/cocoon-reload.xweb,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cocoon-reload.xweb	31 May 2003 18:21:42 -0000	1.2
  +++ cocoon-reload.xweb	26 Nov 2003 06:47:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<xweb xpath="/web-app/servlet/init-param[param-name='allow-reload']/param-value"
  -	if-prop="config.allow-reloads"
  -	remove="/web-app/servlet/init-param[param-name='allow-reload']/param-value/text()"
  ->yes</xweb>
  \ No newline at end of file
  +<xweb xpath="/web-app/servlet/init-param[param-name='allow-reload']/param-value"
  +	if-prop="config.allow-reloads"
  +	remove="/web-app/servlet/init-param[param-name='allow-reload']/param-value/text()"
  +>yes</xweb>
  
  
  
  1.3       +4 -4      cocoon-2.2/src/confpatch/enable-uploads.xweb
  
  Index: enable-uploads.xweb
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/confpatch/enable-uploads.xweb,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- enable-uploads.xweb	31 May 2003 18:21:42 -0000	1.2
  +++ enable-uploads.xweb	26 Nov 2003 06:47:58 -0000	1.3
  @@ -1,4 +1,4 @@
  -<xweb xpath="/web-app/servlet/init-param[param-name='enable-uploads']/param-value"
  -	if-prop="config.enable-uploads"
  -	remove="/web-app/servlet/init-param[param-name='enable-uploads']/param-value/text()"
  ->true</xweb>
  \ No newline at end of file
  +<xweb xpath="/web-app/servlet/init-param[param-name='enable-uploads']/param-value"
  +	if-prop="config.enable-uploads"
  +	remove="/web-app/servlet/init-param[param-name='enable-uploads']/param-value/text()"
  +>true</xweb>
  
  
  
  1.2       +44 -44    cocoon-2.2/src/webapp/samples/flow/jxcalc/calc.js
  
  Index: calc.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/calc.js,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- calc.js	15 Oct 2003 14:18:39 -0000	1.1
  +++ calc.js	26 Nov 2003 06:47:58 -0000	1.2
  @@ -1,44 +1,44 @@
  -var a, b, op;
  -
  -function calculator()
  -{
  -  a = getNumber("a");
  -  b = getNumber("b", a);
  -  op = getOperator(a, b);
  -
  -  if (op == "plus")
  -    sendResult(a, b, op, a + b);
  -  else if (op == "minus")
  -    sendResult(a, b, op, a - b);
  -  else if (op == "multiply")
  -    sendResult(a, b, op, a * b);
  -  else if (op == "divide")
  -    sendResult(a, b, op, a / b);
  -  else
  -    sendResult("Error: Unkown operator!");
  -}
  -
  -function getNumber(name, a, b)
  -{
  -  var uri = "page/getNumber" + name.toUpperCase();
  -  cocoon.sendPageAndWait(uri, { "a" : a, "b" : b });
  -  return parseFloat(cocoon.request.getParameter(name));
  -}
  -
  -function getOperator(a, b)
  -{
  -  cocoon.sendPageAndWait("page/getOperator", { "a" : a, "b" : b });
  -  return cocoon.request.operator;
  -}
  -
  -function sendResult(a, b, op, result)
  -{
  -  cocoon.sendPage("page/displayResult",
  -           { 
  -                "a" : a, 
  -                "b" : b, 
  -                "operator" : op, 
  -                "result" : result 
  -           }
  -  );
  -}
  +var a, b, op;
  +
  +function calculator()
  +{
  +  a = getNumber("a");
  +  b = getNumber("b", a);
  +  op = getOperator(a, b);
  +
  +  if (op == "plus")
  +    sendResult(a, b, op, a + b);
  +  else if (op == "minus")
  +    sendResult(a, b, op, a - b);
  +  else if (op == "multiply")
  +    sendResult(a, b, op, a * b);
  +  else if (op == "divide")
  +    sendResult(a, b, op, a / b);
  +  else
  +    sendResult("Error: Unkown operator!");
  +}
  +
  +function getNumber(name, a, b)
  +{
  +  var uri = "page/getNumber" + name.toUpperCase();
  +  cocoon.sendPageAndWait(uri, { "a" : a, "b" : b });
  +  return parseFloat(cocoon.request.getParameter(name));
  +}
  +
  +function getOperator(a, b)
  +{
  +  cocoon.sendPageAndWait("page/getOperator", { "a" : a, "b" : b });
  +  return cocoon.request.operator;
  +}
  +
  +function sendResult(a, b, op, result)
  +{
  +  cocoon.sendPage("page/displayResult",
  +           { 
  +                "a" : a, 
  +                "b" : b, 
  +                "operator" : op, 
  +                "result" : result 
  +           }
  +  );
  +}
  
  
  
  1.3       +53 -53    cocoon-2.2/src/webapp/samples/flow/jxcalc/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	22 Oct 2003 16:59:48 -0000	1.2
  +++ sitemap.xmap	26 Nov 2003 06:47:58 -0000	1.3
  @@ -1,53 +1,53 @@
  -<?xml version="1.0"?>
  -
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -
  -  <!-- indicates what flowscript to attach to this sitemap -->
  -  <map:flow language="javascript">
  -    <map:script src="../calc/calc.js"/>
  -  </map:flow>
  -
  -  <map:pipelines>
  -    <map:pipeline>
  -      <!--+
  -          | produces the screens called by the flowscript
  -          +-->     
  -      <map:match pattern="page/*">
  -        <map:generate type="jx" src="screens/{1}.xml"/>
  -        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  -          <map:parameter name="servletPath" value="{request:servletPath}"/>
  -          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  -          <map:parameter name="contextPath" value="{request:contextPath}"/>
  -          <map:parameter name="file" value="/samples/flow/jxcalc/screens/{1}.xml"/>
  -          <map:parameter name="remove" value="{0}"/>
  -        </map:transform>
  -        <map:serialize/>
  -      </map:match>
  -    </map:pipeline>
  -
  -    <map:pipeline>
  -      <!--+
  -          | matches the page with the continuation ID and calls the flowscript
  -          | associated to this sitemap with the given continuation ID. The flow
  -          | engine will then look into the continuation store, retrieve
  -          | the correct continuation and resume execution of the flowscript
  -          | with that continuation. This guarantees transparent state 
  -          | resumption between requests without the need for anything else
  -          | (cookies or URL-encoded session IDs)
  -          +-->
  -      <map:match pattern="continue.*">
  -        <map:call continuation="{1}"/>
  -      </map:match>
  -
  -      <!--+
  -          | matches the call to the beginning of the flow and calls the flow
  -          | from its entry point which, in this case is the 'calculator()'
  -          | javascript function.
  -          +-->
  -      <map:match pattern="">
  -        <map:call function="calculator"/>
  -      </map:match>
  -
  -    </map:pipeline>
  -  </map:pipelines>
  -</map:sitemap>
  +<?xml version="1.0"?>
  +
  +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +
  +  <!-- indicates what flowscript to attach to this sitemap -->
  +  <map:flow language="javascript">
  +    <map:script src="../calc/calc.js"/>
  +  </map:flow>
  +
  +  <map:pipelines>
  +    <map:pipeline>
  +      <!--+
  +          | produces the screens called by the flowscript
  +          +-->     
  +      <map:match pattern="page/*">
  +        <map:generate type="jx" src="screens/{1}.xml"/>
  +        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  +          <map:parameter name="servletPath" value="{request:servletPath}"/>
  +          <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  +          <map:parameter name="contextPath" value="{request:contextPath}"/>
  +          <map:parameter name="file" value="/samples/flow/jxcalc/screens/{1}.xml"/>
  +          <map:parameter name="remove" value="{0}"/>
  +        </map:transform>
  +        <map:serialize/>
  +      </map:match>
  +    </map:pipeline>
  +
  +    <map:pipeline>
  +      <!--+
  +          | matches the page with the continuation ID and calls the flowscript
  +          | associated to this sitemap with the given continuation ID. The flow
  +          | engine will then look into the continuation store, retrieve
  +          | the correct continuation and resume execution of the flowscript
  +          | with that continuation. This guarantees transparent state 
  +          | resumption between requests without the need for anything else
  +          | (cookies or URL-encoded session IDs)
  +          +-->
  +      <map:match pattern="continue.*">
  +        <map:call continuation="{1}"/>
  +      </map:match>
  +
  +      <!--+
  +          | matches the call to the beginning of the flow and calls the flow
  +          | from its entry point which, in this case is the 'calculator()'
  +          | javascript function.
  +          +-->
  +      <map:match pattern="">
  +        <map:call function="calculator"/>
  +      </map:match>
  +
  +    </map:pipeline>
  +  </map:pipelines>
  +</map:sitemap>
  
  
  
  1.2       +27 -27    cocoon-2.2/src/webapp/samples/test/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/test/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	9 Oct 2003 18:07:34 -0000	1.1
  +++ sitemap.xmap	26 Nov 2003 06:47:58 -0000	1.2
  @@ -1,27 +1,27 @@
  -<?xml version="1.0" encoding="ISO-8859-1"?>
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  <map:components>
  -    <map:generators default="file"/>
  -    <map:transformers default="xslt"/>
  -    <map:readers default="resource"/>
  -    <map:serializers default="html"/>
  -    <map:selectors default="browser"/>
  -    <map:matchers default="wildcard"/>
  -  </map:components>
  -  <map:pipelines>
  -    <map:pipeline>
  -      <map:match pattern="simpletest-content/**">
  -        <map:generate src="{1}"/>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -      <map:match pattern="simpletest-mounted/**">
  -        <map:mount src="simpletest-mounted/" uri-prefix="simpletest-mounted"/>
  -      </map:match>
  -      <map:match pattern="simpletest">
  -        <map:generate src="cocoon:/simpletest-content/a.xml"/>
  -        <map:transform type="cinclude"/>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -    </map:pipeline>
  -  </map:pipelines>
  -</map:sitemap>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:serializers default="html"/>
  +    <map:selectors default="browser"/>
  +    <map:matchers default="wildcard"/>
  +  </map:components>
  +  <map:pipelines>
  +    <map:pipeline>
  +      <map:match pattern="simpletest-content/**">
  +        <map:generate src="{1}"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +      <map:match pattern="simpletest-mounted/**">
  +        <map:mount src="simpletest-mounted/" uri-prefix="simpletest-mounted"/>
  +      </map:match>
  +      <map:match pattern="simpletest">
  +        <map:generate src="cocoon:/simpletest-content/a.xml"/>
  +        <map:transform type="cinclude"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
  +  </map:pipelines>
  +</map:sitemap>
  
  
  
  1.2       +19 -19    cocoon-2.2/src/webapp/samples/test/simpletest-mounted/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/test/simpletest-mounted/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	9 Oct 2003 18:07:34 -0000	1.1
  +++ sitemap.xmap	26 Nov 2003 06:47:58 -0000	1.2
  @@ -1,19 +1,19 @@
  -<?xml version="1.0" encoding="ISO-8859-1"?>
  -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  <map:components>
  -    <map:generators default="file"/>
  -    <map:transformers default="xslt"/>
  -    <map:readers default="resource"/>
  -    <map:serializers default="html"/>
  -    <map:selectors default="browser"/>
  -    <map:matchers default="wildcard"/>
  -  </map:components>
  -  <map:pipelines>
  -    <map:pipeline>
  -      <map:match pattern="includer">
  -        <map:generate src="c.xml"/>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -    </map:pipeline>
  -  </map:pipelines>
  -</map:sitemap>
  +<?xml version="1.0" encoding="ISO-8859-1"?>
  +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:serializers default="html"/>
  +    <map:selectors default="browser"/>
  +    <map:matchers default="wildcard"/>
  +  </map:components>
  +  <map:pipelines>
  +    <map:pipeline>
  +      <map:match pattern="includer">
  +        <map:generate src="c.xml"/>
  +        <map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
  +  </map:pipelines>
  +</map:sitemap>
  
  
  
  1.2       +17 -17    cocoon-2.2/tools/ide/eclipse/project
  
  Index: project
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/ide/eclipse/project,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project	18 Nov 2003 18:56:13 -0000	1.1
  +++ project	26 Nov 2003 06:47:58 -0000	1.2
  @@ -1,17 +1,17 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<projectDescription>
  -	<name>Cocoon @VERSION@</name>
  -	<comment></comment>
  -	<projects>
  -	</projects>
  -	<buildSpec>
  -		<buildCommand>
  -			<name>org.eclipse.jdt.core.javabuilder</name>
  -			<arguments>
  -			</arguments>
  -		</buildCommand>
  -	</buildSpec>
  -	<natures>
  -		<nature>org.eclipse.jdt.core.javanature</nature>
  -	</natures>
  -</projectDescription>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<projectDescription>
  +	<name>Cocoon @VERSION@</name>
  +	<comment></comment>
  +	<projects>
  +	</projects>
  +	<buildSpec>
  +		<buildCommand>
  +			<name>org.eclipse.jdt.core.javabuilder</name>
  +			<arguments>
  +			</arguments>
  +		</buildCommand>
  +	</buildSpec>
  +	<natures>
  +		<nature>org.eclipse.jdt.core.javanature</nature>
  +	</natures>
  +</projectDescription>
  
  
  
  1.2       +32 -32    cocoon-2.2/tools/ide/emacs/prj.el.in
  
  Index: prj.el.in
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/ide/emacs/prj.el.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- prj.el.in	18 Nov 2003 18:56:13 -0000	1.1
  +++ prj.el.in	26 Nov 2003 06:47:58 -0000	1.2
  @@ -1,32 +1,32 @@
  -;; -*-emacs-lisp-*-
  -;;
  -;; Emacs JDE customization file for Cocoon. It is automatically used
  -;; if you have a decently recent version of GNU Emacs or Xemacs with JDE.
  -;;
  -;; Author: Ovidiu Predescu <ovidiu@apache.org>
  -;; Date: April 2002
  -
  -
  -;; JDE customization
  -(jde-project-file-version "1.0")
  -(jde-set-variables
  - '(jde-project-name "Cocoon")
  - '(jde-compile-option-classpath (split-path "@jar.files@"))
  - '(jde-compile-option-command-line-args "-g")
  - '(jde-compile-option-sourcepath (quote ("@src.dir@")))
  - '(jde-compile-option-directory "@build.war@/WEB-INF/classes")
  - '(jde-global-classpath (split-path "@jar.files@"))
  - '(jde-compile-option-debug (quote ("all" (t nil nil))))
  - '(jde-compiler "javac"))
  -
  -;; Editor customization
  -(defun jde-cocoon-custom ()
  - ;; Indentation level
  - (setq c-basic-offset 4)
  - ;; Set TAB width to 8 characters
  - (setq tab-width 8)
  - ;; Make sure no tabs are used
  - (setq indent-tabs-mode nil)
  - (setq c-toggle-auto-hungry-state 1))
  -
  -(add-hook 'jde-mode-hook 'jde-cocoon-custom t)
  +;; -*-emacs-lisp-*-
  +;;
  +;; Emacs JDE customization file for Cocoon. It is automatically used
  +;; if you have a decently recent version of GNU Emacs or Xemacs with JDE.
  +;;
  +;; Author: Ovidiu Predescu <ovidiu@apache.org>
  +;; Date: April 2002
  +
  +
  +;; JDE customization
  +(jde-project-file-version "1.0")
  +(jde-set-variables
  + '(jde-project-name "Cocoon")
  + '(jde-compile-option-classpath (split-path "@jar.files@"))
  + '(jde-compile-option-command-line-args "-g")
  + '(jde-compile-option-sourcepath (quote ("@src.dir@")))
  + '(jde-compile-option-directory "@build.war@/WEB-INF/classes")
  + '(jde-global-classpath (split-path "@jar.files@"))
  + '(jde-compile-option-debug (quote ("all" (t nil nil))))
  + '(jde-compiler "javac"))
  +
  +;; Editor customization
  +(defun jde-cocoon-custom ()
  + ;; Indentation level
  + (setq c-basic-offset 4)
  + ;; Set TAB width to 8 characters
  + (setq tab-width 8)
  + ;; Make sure no tabs are used
  + (setq indent-tabs-mode nil)
  + (setq c-toggle-auto-hungry-state 1))
  +
  +(add-hook 'jde-mode-hook 'jde-cocoon-custom t)
  
  
  
  1.9       +5 -2      cocoon-2.2/tools/src/anttasks/XConfToolTask.java
  
  Index: XConfToolTask.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/src/anttasks/XConfToolTask.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XConfToolTask.java	21 Jun 2003 06:53:55 -0000	1.8
  +++ XConfToolTask.java	26 Nov 2003 06:47:58 -0000	1.9
  @@ -215,7 +215,10 @@
           } catch (ParserConfigurationException e) {
               throw new BuildException("ParserConfigurationException: "+e);
           } catch (UnknownHostException e) {
  -            throw new BuildException("UnknownHostException.  Probable cause: The parser
is " +
                "trying to resolve a dtd from the internet and no connection exists.\n"
+
                "You can either connect to the internet during the build, or patch \n" +
               "XConfToolTask.java to ignore DTD declarations when your parser is in use.");
  +            throw new BuildException("UnknownHostException.  Probable cause: The parser
is " +
  +              "trying to resolve a dtd from the internet and no connection exists.\n" +
  +              "You can either connect to the internet during the build, or patch \n" +
  +              "XConfToolTask.java to ignore DTD declarations when your parser is in use.");
           } catch (IOException ioe) {
               throw new BuildException("IOException: "+ioe);
           }
  
  
  

Mime
View raw message