vgritsenko 02/03/09 19:09:17
Modified: . build.xml
src/webapp cocoon.xconf sitemap.xmap
Added: src/java/org/apache/cocoon/components/language/markup/xsp/javascript
javascript.xconf javascript.xpipe
src/java/org/apache/cocoon/components/language/programming/javascript
javascript.xconf
Log:
make javascript truly optional
Revision Changes Path
1.181 +5 -4 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- build.xml 9 Mar 2002 06:27:15 -0000 1.180
+++ build.xml 10 Mar 2002 03:09:17 -0000 1.181
@@ -776,10 +776,11 @@
<exclude name="**/XT*.java" unless="xt.present"/>
<exclude name="**/xt.x*" unless="xt.present"/>
- <exclude name="**/CompiledJavascript*" unless="rhino.compiler.present"/>
-
- <exclude name="**/xsp/JSGenerator.java" unless="rhino.interpreter.present"/>
- <exclude name="**/xsp/javascript/**" unless="rhino.interpreter.present"/>
+ <exclude name="**/CompiledJavascript*" unless="rhino.compiler.present"/>
+ <exclude name="**/javascript/Javascript*"
unless="rhino.interpreter.present"/>
+ <exclude name="**/javascript/javascript*"
unless="rhino.interpreter.present"/>
+ <exclude name="**/xsp/JSGenerator.java"
unless="rhino.interpreter.present"/>
+ <exclude name="**/xsp/javascript/**"
unless="rhino.interpreter.present"/>
<exclude name="**/components/resolver/ResolverImpl.java"
unless="resolver.present"/>
<exclude name="**/resolver.x*"
unless="resolver.present"/>
1.1
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/javascript.xconf
Index: javascript.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="cocoon/markup-languages/xsp-language[@name='xsp']"
unless="target-language[@name='js']">
<!-- XSP in Javascript -->
<target-language name="js">
<parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl"/>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-request"/>
<parameter name="uri" value="http://apache.org/xsp/request/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/request.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-response"/>
<parameter name="uri" value="http://apache.org/xsp/response/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/response.xsl"/>
</builtin-logicsheet>
<builtin-logicsheet>
<parameter name="prefix" value="xsp-session"/>
<parameter name="uri" value="http://apache.org/xsp/session/2.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl"/>
</builtin-logicsheet>
</target-language>
</xconf>
1.1
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/javascript.xpipe
Index: javascript.xpipe
===================================================================
<?xml version="1.0"?>
<xpipe xpath="/sitemap/pipelines/pipeline[@id='optional']"
unless="match[@pattern='xsp-js/*']">
<!-- XSP pages written in Javascript -->
<map:match pattern="xsp-js/*">
<map:generate type="serverpages" src="docs/samples/xsp-js/{1}.xsp">
<map:parameter name="programming-language" value="js"/>
</map:generate>
<map:transform src="stylesheets/dynamic-page2html.xsl">
<map:parameter name="view-source" value="docs/samples/xsp-js/{1}.xsp"/>
</map:transform>
<map:serialize/>
</map:match>
</xpipe>
1.1
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/javascript.xconf
Index: javascript.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="cocoon/programming-languages"
unless="language[@name='js']">
<!-- Interpreted JavaScript language -->
<js-language name="js" logger="core.language.js"/>
</xconf>
1.37 +3 -30 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cocoon.xconf 9 Mar 2002 06:27:16 -0000 1.36
+++ cocoon.xconf 10 Mar 2002 03:09:17 -0000 1.37
@@ -223,10 +223,6 @@
<!-- A singleton-like implementation of a ClassLoader -->
<parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
</java-language>
-
- <!-- Interpreted JavaScript language -->
- <js-language name="js" logger="core.language.js"/>
-
</programming-languages>
<!-- Class loader:
@@ -245,8 +241,8 @@
<parameter name="prefix" value="xsp"/>
<parameter name="uri" value="http://apache.org/xsp"/>
- <!-- Defines the XSP Core logicsheet for the Java language -->
<target-language name="java">
+ <!-- Defines the XSP Core logicsheet for the Java language -->
<parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
<!-- The Request logicsheet (taglib) is an XSP logicsheet that wraps XML
tags
@@ -349,29 +345,6 @@
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/soap.xsl"/>
</builtin-logicsheet>
</target-language>
-
- <target-language name="js">
- <parameter name="core-logicsheet"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl"/>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-request"/>
- <parameter name="uri" value="http://apache.org/xsp/request/2.0"/>
- <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/request.xsl"/>
- </builtin-logicsheet>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-response"/>
- <parameter name="uri" value="http://apache.org/xsp/response/2.0"/>
- <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/response.xsl"/>
- </builtin-logicsheet>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-session"/>
- <parameter name="uri" value="http://apache.org/xsp/session/2.0"/>
- <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl"/>
- </builtin-logicsheet>
- </target-language>
-
</xsp-language>
<!-- Defines Sitemap Core logicsheet for the Java language -->
@@ -385,8 +358,7 @@
</sitemap-language>
</markup-languages>
- <!-- Datasources:
- -->
+ <!-- Datasources: -->
<datasources>
<jdbc name="personnel" logger="core.datasources.personnel">
<!--
@@ -508,6 +480,7 @@
To use this engine, comment the declaration above and uncomment the declaration
below.
-->
<!--sitemap class="org.apache.cocoon.components.treeprocessor.TreeProcessor"
logger="sitemap"/-->
+
<!-- ===================== Sitemap Components =========================== -->
1.39 +0 -11 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sitemap.xmap 9 Mar 2002 06:27:16 -0000 1.38
+++ sitemap.xmap 10 Mar 2002 03:09:17 -0000 1.39
@@ -901,17 +901,6 @@
<map:serialize/>
</map:match>
- <map:match pattern="xsp-js/*">
- <!-- XSP pages written in Javascript -->
- <map:generate type="serverpages" src="docs/samples/xsp-js/{1}.xsp">
- <map:parameter name="programming-language" value="js"/>
- </map:generate>
- <map:transform src="stylesheets/dynamic-page2html.xsl">
- <map:parameter name="view-source" value="docs/samples/xsp-js/{1}.xsp"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
<map:match pattern="xsp-plain/*">
<map:generate type="serverpages" src="docs/samples/xsp/{1}.xsp"/>
<map:serialize/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
