cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2 changes.xml
Date Mon, 11 Nov 2002 14:20:50 GMT
cziegeler    2002/11/11 06:20:50

  Modified:    src/java/org/apache/cocoon/transformation
                        TraxTransformer.java
               src/webapp sitemap.xmap
               .        changes.xml
  Log:
  Readding use-deli configuration to trax transformer - discussed this with Mark.
  
  Revision  Changes    Path
  1.36      +15 -5     xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- TraxTransformer.java	31 Oct 2002 03:21:13 -0000	1.35
  +++ TraxTransformer.java	11 Nov 2002 14:20:49 -0000	1.36
  @@ -128,14 +128,14 @@
    * session-id-from-cookie, session-id-from-url, session-valid, session-id.<br>
    * This property is false by default.
    *
  - * <p> The &lt;use-deli&gt; configuration is not supported anymore.
  + * <p> The &lt;use-deli&gt; makes the DELI information available.
    * If DELI component is configured in the cocoon.xconf, transformer will
  - * always make all the properties from the CC/PP profile resolved from
  + * make all the properties from the CC/PP profile resolved from
    * the request available in the XSLT stylesheets.  CC/PP support is
    * provided via the DELI library. If the request does not provide
    * CC/PP information, then CC/PP information can added via the DELI
    * legacy device database.
  - *
  + * 
    * <p>Note that these properties might introduces issues concerning
    * cacheability of the generated output of this transformer.<br>
    *
  @@ -176,6 +176,10 @@
       /** The DELI service instance */
       private Deli deli = null;
   
  +    /** Should we make the DELI CC/PP profile available to the stylesheet (default is off)
*/
  +    private boolean useDeli = false;
  +    private boolean _useDeli = false;
  +    
       /** Should we make the request parameters available in the stylesheet? (default is
off) */
       private boolean useParameters = false;
       private boolean _useParameters = false;
  @@ -245,6 +249,10 @@
               this.useSessionInfo = child.getValueAsBoolean(false);
               this._useSessionInfo = this.useSessionInfo;
   
  +            child = conf.getChild("use-deli");
  +            this.useDeli = child.getValueAsBoolean(false);
  +            this._useDeli = this.useDeli;
  +            
               child = conf.getChild("transformer-factory");
   
               // traxFactory is null, if transformer-factory config is unspecified
  @@ -255,6 +263,7 @@
                   this.getLogger().debug("Use cookies is " + this.useCookies + " for " +
this);
                   this.getLogger().debug("Use browser capabilities is " + this.useBrowserCap
+ " for " + this);
                   this.getLogger().debug("Use session info is " + this.useSessionInfo + "
for " + this);
  +                this.getLogger().debug("Use DELI is " + this.useDeli + " for " + this);
   
                   if (this.traxFactory != null) {
                       this.getLogger().debug("Use TrAX Transformer Factory " + this.traxFactory);
  @@ -324,6 +333,7 @@
           _useBrowserCap = par.getParameterAsBoolean("use-browser-capabilities-db", this.useBrowserCap);
           _useCookies = par.getParameterAsBoolean("use-cookies", this.useCookies);
           _useSessionInfo = par.getParameterAsBoolean("use-session-info", this.useSessionInfo);
  +        _useDeli = par.getParameterAsBoolean("use-deli", this.useDeli);
   
           if (this.getLogger().isDebugEnabled()) {
               this.getLogger().debug("Using stylesheet: '" + this.inputSource.getSystemId()
+ "' in " + this);
  @@ -521,7 +531,7 @@
               getLogger().error("Error setting Browser info", e);
           }
   
  -        if (this.deli != null) {
  +        if (this.deli != null && this._useDeli) {
               try {
                   Request request = ObjectModelHelper.getRequest(objectModel);
                   if (map == null) {
  
  
  
  1.83      +0 -4      xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- sitemap.xmap	31 Oct 2002 03:21:13 -0000	1.82
  +++ sitemap.xmap	11 Nov 2002 14:20:50 -0000	1.83
  @@ -356,10 +356,6 @@
          <autoCachingPoint>On</autoCachingPoint>
        </map:pipeline>
        <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  -     <!-- The following two can be used for profiling:
  -     <map:pipeline name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  -     <map:pipeline name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  -     -->
     </map:pipelines>
   
    </map:components>
  
  
  
  1.280     +1 -5      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.279
  retrieving revision 1.280
  diff -u -r1.279 -r1.280
  --- changes.xml	10 Nov 2002 17:31:36 -0000	1.279
  +++ changes.xml	11 Nov 2002 14:20:50 -0000	1.280
  @@ -66,10 +66,6 @@
       as archive entries. Can be used to generate zip files, sxw files (OpenOffice),
       jar files, etc.
     </action>
  -  <action dev="VG" type="update">
  -    TraxTransformer does not have use-deli parameter anymore. If deli is
  -    configured in the cocoon.xconf, it always will be used.
  -  </action>
     <action dev="VG" type="fix" fixes-bug="13648" due-to="Geoff Howard" due-to-email="javageoff@yahoo.com">
       CocoonServlet upload behavior now configurable from the web.xml.
       Configuration parameters are: autosave-uploads, overwrite-uploads,
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message