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/src/java/org/apache/cocoon/webapps/session/context RequestSessionContext.java
Date Wed, 17 Jul 2002 07:27:09 GMT
cziegeler    2002/07/17 00:27:08

  Modified:    .        build.xml
               src/documentation/xdocs/developing/webapps session.xml
               src/java/org/apache/cocoon/webapps/session/context
                        RequestSessionContext.java
  Log:
  Making optional jars really optional!!!!!
  
  Revision  Changes    Path
  1.250     +34 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- build.xml	16 Jul 2002 13:11:32 -0000	1.249
  +++ build.xml	17 Jul 2002 07:27:08 -0000	1.250
  @@ -500,6 +500,10 @@
       <available classpathref="classpath" 
                  property="jisp.present" 
                  classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
  +
  +    <available classpathref="classpath" 
  +               property="jxpath.present" 
  +               classname="org.apache.commons.jxpath.JXPathContext"/>
     </target>
     
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
  @@ -755,12 +759,22 @@
       </antcall>
     </target>  
     
  +  <!-- Outputs a warning if org.apache.commons.jxpath.* classes are missing during compilation
-->
  +  <target name="jxpath-warn" unless="jxpath.present" depends="optional-tests">
  +    <antcall target="op-warning">
  +      <param name="thing" value="JXPath"/>
  +      <param name="recovery" 
  +        value="Get the JXPath package and place the jar in the lib/optional dir"/>
  +      <param name="message"
  +             value="The JXPath package is required for ...."/>
  +    </antcall>
  +  </target>  
        
     <!-- =================================================================== -->
     <!-- Print out warnings for optional components                          -->
     <!-- =================================================================== -->
     <target name="optional-warnings" 
  -          depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, php-warn, naming-warn,
svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn,
resolver-warn, jisp-warn, pizza-warn, poi-warn, commons-logging-warn">
  +          depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, php-warn, naming-warn,
svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn,
resolver-warn, jisp-warn, pizza-warn, poi-warn, commons-logging-warn, jxpath-warn">
     </target>
   
   
  @@ -796,6 +810,7 @@
           <exclude name="**/servlet/*.java"          unless="servlet.present"/>
           <exclude name="**/environment/http/*.java" unless="servlet.present"/>
           <exclude name="**/generation/StreamGenerator.java" unless="servlet.present"/>
  +        <exclude name="**/components/request/**"   unless="servlet.present"/>
   
           <exclude name="**/ScriptAction.java"       unless="bsf.present"/>
           <exclude name="**/ScriptGenerator.java"    unless="bsf.present"/>
  @@ -824,6 +839,7 @@
           <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="**/flow/javascript/**"      unless="rhino.interpreter.present"/>
   
           <exclude name="**/programming/python/*"    unless="python.present"/>
           <exclude name="**/xsp/PythonGenerator*"    unless="python.present"/>
  @@ -869,6 +885,12 @@
           <exclude name="**/components/store/Jisp*.java" unless="jisp.present"/>
           <exclude name="**/jisp.*"                      unless="jisp.present"/>
   
  +        <exclude name="**/components/xmlform/**"    unless="jxpath.present"/>
  +        <exclude name="**/samples/xmlform/**"       unless="jxpath.present"/>
  +        <exclude name="**/acting/**XMLForm**"       unless="jxpath.present"/>
  +        <exclude name="**/transformation/**XMLForm**"       unless="jxpath.present"/>
  +        <exclude name="**/components/validation/**" unless="jxpath.present"/>
  +
           <exclude name="**/MaybeUpload*.java"           unless="maybeupload.present"/>
           <exclude name="**/http/RequestWrapper*.java"/>
           <exclude name="**/browser/*.x*"/>
  @@ -880,6 +902,17 @@
       <copy todir="${build.scratchpad.src}" filtering="on">
         <fileset dir="${scratchpad.src}">
           <exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
  +
  +        <exclude name="**/components/request/**"                unless="servlet.present"/>
  +        <exclude name="**/precept/**"                           unless="servlet.present"/>
  +        <exclude name="**/reading/ByteRangeResourceReader.java" unless="servlet.present"/>
  +        <exclude name="**/acting/SourceMultiAction.java"        unless="servlet.present"/>
  +        <exclude name="**/acting/SourceUploadAction.java"       unless="servlet.present"/>
  +        <exclude name="**/generation/RequestAttribute**.java"   unless="servlet.present"/>
  +
  +        <exclude name="**/jxpath/**" unless="jxpath.present"/>
  +        <exclude name="**/taglib/**" unless="jxpath.present"/>
  +        <exclude name="**/transformation/TagTransformer.java" unless="jxpath.present"/>
   
           <exclude name="**/XMLDB*.java" unless="xmldb.present"/>
           <exclude name="**/DbXML*.java" unless="xmldb.present"/>
  
  
  
  1.2       +0 -1      xml-cocoon2/src/documentation/xdocs/developing/webapps/session.xml
  
  Index: session.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/webapps/session.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- session.xml	14 Jun 2002 07:09:11 -0000	1.1
  +++ session.xml	17 Jul 2002 07:27:08 -0000	1.2
  @@ -284,7 +284,6 @@
   &lt;scheme&gt;value&lt;/scheme&gt;
   &lt;serverName&gt;value&lt;/serverName&gt;
   &lt;serverPort&gt;value&lt;/serverPort&gt;
  -&lt;authType&gt;value&lt;/authType&gt;
   &lt;method&gt;value&lt;/method&gt;
   &lt;contextPath&gt;value&lt;/contextPath&gt;
   &lt;pathInfo&gt;value&lt;/pathInfo&gt;
  
  
  
  1.4       +2 -8      xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
  
  Index: RequestSessionContext.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RequestSessionContext.java	12 Jul 2002 11:25:58 -0000	1.3
  +++ RequestSessionContext.java	17 Jul 2002 07:27:08 -0000	1.4
  @@ -62,7 +62,6 @@
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
   import org.apache.excalibur.source.SourceResolver;
  -import org.apache.cocoon.environment.http.HttpRequest;
   import org.apache.cocoon.webapps.session.SessionConstants;
   import org.apache.cocoon.webapps.session.connector.Resource;
   import org.apache.cocoon.webapps.session.xml.XMLUtil;
  @@ -126,7 +125,6 @@
    * /scheme
    * /serverName
    * /serverPort
  - * /authType        <!-- only for http -->
    * /method
    * /contextPath
    * /pathInfo
  @@ -143,6 +141,7 @@
    *  - getUserPrincipal()
    *  - getLocale()
    *  - getLocales()
  + *  - getAuthType()
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
    * @version CVS $Id$
  @@ -241,11 +240,6 @@
           node = doc.createElementNS(null, "serverPort");
           node.appendChild(this.createTextNode(doc, ""+this.request.getServerPort()));
           root.appendChild(node);
  -        if (this.request instanceof HttpRequest) {
  -            node = doc.createElementNS(null, "authType");
  -            node.appendChild(this.createTextNode(doc, ((HttpRequest)this.request).getAuthType()));
  -            root.appendChild(node);
  -        }
           node = doc.createElementNS(null, "method");
           node.appendChild(this.createTextNode(doc, this.request.getMethod()));
           root.appendChild(node);
  
  
  

----------------------------------------------------------------------
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