ivelin 2002/06/30 10:00:45 Modified: lib jars.xml src/webapp sitemap.xmap src/webapp/WEB-INF cocoon.xconf src/webapp/samples/xmlform sitemap.xmap src/webapp/samples/xmlform/schematron wizard-xmlform-sch-report.xml src/webapp/samples/xmlform/wizard deployment.xml system.xml userIdentity.xml src/webapp/stylesheets/xmlform xmlform2html.xsl Added: lib/core commons-httpclient.jar xsltc.jar Removed: lib/core commons-httpclient-20020423.jar src/scratchpad/lib xsltc.jar Log: no message Revision Changes Path 1.15 +10 -2 xml-cocoon2/lib/jars.xml Index: jars.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jars.xml 27 Jun 2002 22:52:12 -0000 1.14 +++ jars.xml 30 Jun 2002 17:00:43 -0000 1.15 @@ -41,8 +41,8 @@ component seeks to fill this void by providing an efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations.</description> - <used-by>SOAP logicsheet</used-by> - <lib>core/commons-httpclient-20020423.jar</lib> + <used-by>SOAP logicsheet, WebServiceProxyGenerator</used-by> + <lib>core/commons-httpclient.jar</lib> <homepage>http://jakarta.apache.org/commons/httpclient/</homepage> </file> <file> @@ -69,6 +69,13 @@ <homepage>http://xml.apache.org/xalan/</homepage> </file> <file> + <title>The XSLTC processor</title> + <description>XLTC is an XSLT compiler that fully supports the W3C specs.</description> + <used-by>Cocoon TraxTransformer</used-by> + <lib>core/xsltc.jar</lib> + <homepage>http://xml.apache.org/xalan-j/xsltc_usage.html</homepage> + </file> + <file> <title>The XML parser</title> <description>Xerces is an XML parser.</description> <used-by>Cocoon</used-by> @@ -263,3 +270,4 @@ <homepage>http://www.mozilla.org/rhino/</homepage> </file> </jars> + 1.1 xml-cocoon2/lib/core/commons-httpclient.jar <<Binary file>> 1.1 xml-cocoon2/lib/core/xsltc.jar <<Binary file>> 1.63 +15 -12 xml-cocoon2/src/webapp/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sitemap.xmap 24 Jun 2002 10:44:32 -0000 1.62 +++ sitemap.xmap 30 Jun 2002 17:00:44 -0000 1.63 @@ -81,27 +81,29 @@ and the serializer. You may have as many transformers as you like. Transformers consume SAX events and emmit SAX events. - The "xslt" transformer is an example of a component with additional + The "xalan" transformer is an example of a component with additional configuration. --> <map:transformers default="xslt"> - <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.TraxTransformer"> + <!-- NOTE: This used to be the default XSLT processor. The default now is XSLTC --> + <map:transformer name="xalan" logger="sitemap.transformer.xslt" pool-grow="2" pool-max="32" pool-min="8" src="org.apache.cocoon.transformation.TraxTransformer"> <use-request-parameters>false</use-request-parameters> <use-browser-capabilities-db>false</use-browser-capabilities-db> <use-deli>false</use-deli> </map:transformer> - <!-- uncomment the following if you want to use Xalan XSLTC as the "xsltc" transformer - NOTE: be sure to have its jar file in your /WEB-INF/lib directory. To obtain the - XSLTC jar you have to rebuild Xalan by hand using the "xsltc.jar" build target! --> - <!--map:transformer name="xsltc" src="org.apache.cocoon.transformation.TraxTransformer" + <!-- + NOTE: XSLTC is now the default processor. If you use Xalan extensions, + use the "xalan" transformer. + --> + <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer" logger="sitemap.transformer.xsltc" pool-max="32" pool-min="8" pool-grow="2"> <use-request-parameters>false</use-request-parameters> <use-browser-capabilities-db>false</use-browser-capabilities-db> <use-deli>false</use-deli> <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory> - </map:transformer--> + </map:transformer> <map:transformer logger="sitemap.transformer.log" name="log" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.LogTransformer"/> @@ -643,10 +645,9 @@ </map:otherwise> </map:select> --> - <!-- uncomment the following if you want to use Xalan XSLTC as the "xsltc" transformer - <map:transform type="xsltc" src="stylesheets/simple-samples2html.xsl"/> - --> - <map:transform src="stylesheets/simple-samples2html.xsl"/> + <map:transform type="xslt" src="stylesheets/simple-samples2html.xsl"/> + <!-- uncomment the following if you want to use Xalan's interpreter as the XSLT processor --> + <!-- <map:transform type="xalan" src="stylesheets/simple-samples2html.xsl"/> --> <!-- These events are consumed by the default transformer, which uses "stylesheets/simple-samples2html.xsl" as parameter. Since @@ -1221,4 +1222,6 @@ </map:pipeline> </map:pipelines> -</map:sitemap><!-- end of file --> \ No newline at end of file +</map:sitemap><!-- end of file --> + + 1.26 +119 -0 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf Index: cocoon.xconf =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cocoon.xconf 27 Jun 2002 10:06:57 -0000 1.25 +++ cocoon.xconf 30 Jun 2002 17:00:44 -0000 1.26 @@ -592,4 +592,123 @@ <parameter name="deli-config-file" value="resources/deli/config/deliConfig.xml"/> </deli> --> + + <!-- =============== Sitemap In/Out/Database Modules ==================== --> + + <input-modules logger="core.modules.input"> + <component-instance class="org.apache.cocoon.components.modules.input.RequestParameterModule" name="request"/> + <component-instance class="org.apache.cocoon.components.modules.input.RequestAttributeModule" name="attribute"/> + <component-instance class="org.apache.cocoon.components.modules.input.RequestURIModule" name="URI"/> + <component-instance class="org.apache.cocoon.components.modules.input.HeaderAttributeModule" name="header"/> + <component-instance class="org.apache.cocoon.components.modules.input.SessionAttributeModule" name="session"/> + <component-instance class="org.apache.cocoon.components.modules.input.StringConstantModule" name="constant"/> + <component-instance class="org.apache.cocoon.components.modules.input.RandomNumberModule" name="random"/> + <component-instance class="org.apache.cocoon.components.modules.input.CollectionMetaModule" name="collection"/> + <component-instance class="org.apache.cocoon.components.modules.input.DigestMetaModule" name="digest"/> + <component-instance class="org.apache.cocoon.components.modules.input.DateInputModule" name="date"/> + <component-instance class="org.apache.cocoon.components.modules.input.NullInputModule" name="nullinput"/> + <component-instance class="org.apache.cocoon.components.modules.input.DefaultsMetaModule" name="defaults"> + <input-module name="request"/> + <values> + <skin>defaultSkin</skin> + <base-url>http://localhost:8080/cocoon</base-url> + </values> + </component-instance> + </input-modules> + + <output-modules logger="core.modules.output"> + <component-instance class="org.apache.cocoon.components.modules.output.RequestAttributeOutputModule" name="attribute"/> + <component-instance class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule" name="session"/> + </output-modules> + + <autoincrement-modules logger="core.modules.auto"> + <component-instance class="org.apache.cocoon.components.modules.database.HsqlIdentityAutoIncrementModule" name="auto"/> +<!-- + Choose the one suitable for your DBMS. You *can* have more than + one at a time, but they need to have different names. You then + need to specify explicitly, which one to use in your descriptor + file. + + <component-instance name="auto" class="org.apache.cocoon.components.modules.database.ManualAutoIncrementModule"/> + <component-instance name="auto" class="org.apache.cocoon.components.modules.database.IfxSerialAutoIncrementModule"/> + <component-instance name="auto" class="org.apache.cocoon.components.modules.database.MysqlAutoIncrementModule"/> +--> + </autoincrement-modules> + + + <!-- Flow interpreter support. + + The attributes recognized by the <flow-interpreters> element are: + + default (string value): + + the default interpreted language assumed for <map:script> + elements which do not specify a "language" attribute. If not + present, the first language that's described within the + <flow-interpreters> element is assumed to be the default + language. + + reload-scripts (boolean value, default false): + + whether to check if the scripts source files are + modified. Checking for modification is an expensive + operation, so leave it disabled in a production + environment. If not present it is assumed to be "false". When + "true" *all* script files are checked for modification on + each function invocation done using <map:call + function="...">, but not more frequent than the value of + "check-time" (see below). + + check-time (long value, default 1000): + + time in miliseconds between the checks for the last + modification date of script files. + + Within <flow-interpreters> only <component-instance> elements are + recognized. The attributes recognized by this element are "name" + and "class". "name" specifies the name of a scripting language, + and "class" defines the Java class that implements it. See + org.apache.cocoon.components.flow.Interpreter for the Cocoon + interface with an scripting language interpreter. + + --> + + <flow-interpreters check-time="2000" default="JavaScript" logger="flow" reload-scripts="true"> + + <component-instance class="org.apache.cocoon.components.flow.javascript.JavaScriptInterpreter" name="JavaScript"> + <load-on-startup>resource://org/apache/cocoon/components/flow/javascript/system.js</load-on-startup> + </component-instance> + +<!-- + Temporarily disable Scheme, until full support is completed +--> + +<!-- + <component-instance name="Scheme" + class="org.apache.cocoon.components.flow.scheme.SchemeInterpreter"> + <load-on-startup>resource://org/apache/cocoon/components/flow/scheme/system.scm</load-on-startup> + <heap>/WEB-INF/sisc.heap</heap> + </component-instance> +--> + + </flow-interpreters> + + <continuations time-to-live="3600"/> + + + + <component class="org.apache.cocoon.webapps.session.components.SessionManager" logger="core.session-manager" pool-grow="4" pool-max="32" pool-min="8" role="org.apache.cocoon.webapps.session.components.SessionManager"/> + <component class="org.apache.cocoon.webapps.session.connector.ResourceConnectorImpl" logger="core.resource-connector" role="org.apache.cocoon.webapps.session.connector.ResourceConnector"/> + + + <component class="org.apache.cocoon.webapps.portal.components.PortalManager" role="org.apache.cocoon.webapps.portal.components.PortalManager"/> + + + <component class="org.apache.cocoon.webapps.authentication.components.AuthenticationManager" role="org.apache.cocoon.webapps.authentication.components.AuthenticationManager"> + <mediatypes default="html"> + <media name="wap" useragent="Nokia"/> + <media name="wap" useragent="UP"/> + <media name="wap" useragent="Wapalizer"/> + </mediatypes> + </component> </cocoon> 1.4 +26 -5 xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sitemap.xmap 17 Jun 2002 09:11:07 -0000 1.3 +++ sitemap.xmap 30 Jun 2002 17:00:44 -0000 1.4 @@ -13,11 +13,26 @@ <map:readers default="resource"/> <map:serializers default="html"/> <map:selectors default="browser"/> - <map:matchers default="wildcard"> - <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/> - </map:matchers> </map:components> + +<!-- =========================== Views =================================== --> + +<!-- + The debug view can be used to output an intermediate + snapshot of the pipeline. + Pass cocoon-view=debug as a URL parameter to see + the pipeline output produced by the transofrmer + labeled "debug". You can move the label to different + transformers to understand each processing + stage better. +--> + <map:views> + <map:view name="debug" from-label="debug"> + <map:serialize type="xml"/> + </map:view> + </map:views> + <!-- =========================== Resources ================================= --> <map:resources> @@ -49,8 +64,8 @@ <!-- Content transformation logic --> <map:generate src="wizard/{page}.xml"/> - <map:transform type="xmlform" label="xml"/> - <map:transform src="stylesheets/wizard2html.xsl"/> + <map:transform type="xmlform" label="debug"/> + <map:transform src="stylesheets/wizard2html.xsl" /> <map:transform src="context://stylesheets/xmlform/xmlform2html.xsl"/> <map:serialize type="html"/> </map:act> @@ -59,5 +74,11 @@ </map:pipelines> </map:sitemap> <!-- end of file --> + + + + + + 1.3 +2 -1 xml-cocoon2/src/webapp/samples/xmlform/schematron/wizard-xmlform-sch-report.xml Index: wizard-xmlform-sch-report.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/schematron/wizard-xmlform-sch-report.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wizard-xmlform-sch-report.xml 23 May 2002 13:39:47 -0000 1.2 +++ wizard-xmlform-sch-report.xml 30 Jun 2002 17:00:45 -0000 1.3 @@ -38,7 +38,7 @@ <pattern name="User Info Validation Pattern" id="user"> <rule context="/firstName"> <assert test="string-length(.) > 3"> - First name should be at least 4 characters. + First name <anametag/> <wrapper>should</wrapper> be at least 4 characters. </assert> <assert test="string-length(.) < 20"> First name should be less than 20 characters. @@ -92,6 +92,7 @@ </pattern> </schema> + 1.2 +1 -1 xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml Index: deployment.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- deployment.xml 20 May 2002 13:33:50 -0000 1.1 +++ deployment.xml 30 Jun 2002 17:00:45 -0000 1.2 @@ -13,7 +13,7 @@ <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> - <xf:form id="form-feedback" view="deployment" action="wizard.html"> + <xf:form id="form-feedback" view="deployment" action="wizard.html" method="GET"> <xf:caption>Cocoon Deployment Information</xf:caption> 1.3 +1 -1 xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml Index: system.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- system.xml 2 Jun 2002 03:33:35 -0000 1.2 +++ system.xml 30 Jun 2002 17:00:45 -0000 1.3 @@ -14,7 +14,7 @@ <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> - <xf:form id="form-feedback" view="system" action="wizard.html"> + <xf:form id="form-feedback" view="system" action="wizard.html" method="GET"> <xf:caption>System Information</xf:caption> 1.3 +1 -1 xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml Index: userIdentity.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- userIdentity.xml 2 Jun 2002 03:33:35 -0000 1.2 +++ userIdentity.xml 30 Jun 2002 17:00:45 -0000 1.3 @@ -13,7 +13,7 @@ <document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002"> - <xf:form id="form-feedback" view="userIdentity" action="wizard.html"> + <xf:form id="form-feedback" view="userIdentity" action="wizard.html" method="GET"> <xf:caption>Personal Information</xf:caption> 1.4 +2 -0 xml-cocoon2/src/webapp/stylesheets/xmlform/xmlform2html.xsl Index: xmlform2html.xsl =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/stylesheets/xmlform/xmlform2html.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmlform2html.xsl 8 Jun 2002 17:59:54 -0000 1.3 +++ xmlform2html.xsl 30 Jun 2002 17:00:45 -0000 1.4 @@ -159,3 +159,5 @@ + +
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]