You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/05/18 13:42:13 UTC

cvs commit: cocoon-2.0/src/java/org/apache/cocoon/webapps/session SessionConstants.java

cziegeler    2003/05/18 04:42:13

  Modified:    src/webapp/samples/portal-fw/resources sunrise-delrole.xml
                        sunrise-loaduser.xml roleprofile.xml
                        sunrise-deluser.xml saveuserprofile.xml
                        sunrise-newrole.xml userstatus.xml
                        saveuserstatus.xml sunrise-changeuser.xml
                        saveroleprofile.xml saveglobalprofile.xml
                        sunrise-newuser.xml userprofile.xml
               src/documentation/xdocs/developing/webapps portal.xml
                        session.xml
               src/webapp/samples/portal-fw/resources/auth portal.xml
                        sunletconfig-customnews.xml sunlet-customnews.xml
               src/java/org/apache/cocoon/webapps/session
                        SessionConstants.java
  Log:
  Changing namespace form cocoon.apache.org/session to apache.org/cocoon/session
  
  Revision  Changes    Path
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-delrole.xml
  
  Index: sunrise-delrole.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-delrole.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-delrole.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-delrole.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -6,7 +6,7 @@
   -->
   
   <addrole xmlns:source="http://apache.org/cocoon/source/1.0"
  -         xmlns:session="http://cocoon.apache.org/session/1.0">
  +         xmlns:session="http://apache.org/cocoon/session/1.0">
   	<source:insert>
       		<source:source>resources/sunrise-roles.xml</source:source>
       		<source:path>roles</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-loaduser.xml
  
  Index: sunrise-loaduser.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-loaduser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-loaduser.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-loaduser.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -4,7 +4,7 @@
    Description: load u user
   
   -->
  -<loaduser xmlns:session="http://cocoon.apache.org/session/1.0"
  +<loaduser xmlns:session="http://apache.org/cocoon/session/1.0"
             xmlns:cinclude="http://apache.org/cocoon/include/1.0">
   	<info>
   		<ID><session:getxml context="request" path="/parameter/ID"/></ID>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/roleprofile.xml
  
  Index: roleprofile.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/roleprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- roleprofile.xml	9 Mar 2003 00:06:40 -0000	1.1
  +++ roleprofile.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -2,7 +2,7 @@
   <!-- $Id$ 
       Try to include the corresponding role profile
   -->
  -<roledelta xmlns:session="http://cocoon.apache.org/session/1.0"
  +<roledelta xmlns:session="http://apache.org/cocoon/session/1.0"
              xmlns:cinclude="http://apache.org/cocoon/include/1.0">
       <cinclude:includexml ignoreErrors="true">
          <cinclude:src>profiles/roleprofile-<session:getxml context="request" path="/parameter/role"/>.xml</cinclude:src>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-deluser.xml
  
  Index: sunrise-deluser.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-deluser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-deluser.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-deluser.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -5,7 +5,7 @@
   -->
   
   <adduser xmlns:source="http://apache.org/cocoon/source/1.0"
  -         xmlns:session="http://cocoon.apache.org/session/1.0">
  +         xmlns:session="http://apache.org/cocoon/session/1.0">
   	<!-- delete from authentication users -->
   	<source:insert>
       		<source:source>resources/sunrise-user.xml</source:source>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/saveuserprofile.xml
  
  Index: saveuserprofile.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/saveuserprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveuserprofile.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ saveuserprofile.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -6,7 +6,7 @@
   
   -->
   <userdelta xmlns:source="http://apache.org/cocoon/source/1.0"
  -           xmlns:session="http://cocoon.apache.org/session/1.0">
  +           xmlns:session="http://apache.org/cocoon/session/1.0">
       <source:insert>
       	  <source:source>profiles/userprofile-<session:getxml context="request" path="/parameter/ID"/>.xml</source:source>
           <source:path>/</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-newrole.xml
  
  Index: sunrise-newrole.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-newrole.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-newrole.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-newrole.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -6,7 +6,7 @@
   -->
   
   <addrole xmlns:source="http://apache.org/cocoon/source/1.0"
  -         xmlns:session="http://cocoon.apache.org/session/1.0">
  +         xmlns:session="http://apache.org/cocoon/session/1.0">
   	<source:insert>
       		<source:source>resources/sunrise-roles.xml</source:source>
       		<source:path>roles</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/userstatus.xml
  
  Index: userstatus.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/userstatus.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userstatus.xml	9 Mar 2003 00:06:42 -0000	1.1
  +++ userstatus.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -3,7 +3,7 @@
    Description: Load the status profile from a file name userstatus-<username>.xml
   
   -->
  -<statusprofile xmlns:session="http://cocoon.apache.org/session/1.0"
  +<statusprofile xmlns:session="http://apache.org/cocoon/session/1.0"
                  xmlns:cinclude="http://apache.org/cocoon/include/1.0">
   
       <cinclude:includexml ignoreErrors="true">
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/saveuserstatus.xml
  
  Index: saveuserstatus.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/saveuserstatus.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveuserstatus.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ saveuserstatus.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -5,7 +5,7 @@
   
   -->
   <userdelta xmlns:source="http://apache.org/cocoon/source/1.0"
  -           xmlns:session="http://cocoon.apache.org/session/1.0">
  +           xmlns:session="http://apache.org/cocoon/session/1.0">
       <source:insert>
       	  <source:source>profiles/userstatus-<session:getxml context="request" path="/parameter/ID"/>.xml</source:source>
       	  <source:path>/</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-changeuser.xml
  
  Index: sunrise-changeuser.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-changeuser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-changeuser.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-changeuser.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -6,7 +6,7 @@
   -->
   
   <adduser xmlns:source="http://apache.org/cocoon/source/1.0"
  -         xmlns:session="http://cocoon.apache.org/session/1.0">
  +         xmlns:session="http://apache.org/cocoon/session/1.0">
   	<!-- add to authentication users -->
   	<source:insert>
       		<source:source>resources/sunrise-user.xml</source:source>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/saveroleprofile.xml
  
  Index: saveroleprofile.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/saveroleprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveroleprofile.xml	9 Mar 2003 00:06:40 -0000	1.1
  +++ saveroleprofile.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -4,7 +4,7 @@
   
   -->
   <userdelta xmlns:source="http://apache.org/cocoon/source/1.0"
  -           xmlns:session="http://cocoon.apache.org/session/1.0">
  +           xmlns:session="http://apache.org/cocoon/session/1.0">
   	<source:insert>
       		<source:source>profiles/roleprofile-<session:getxml context="request" path="/parameter/role"/>.xml</source:source>
       	      <source:path>/</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/saveglobalprofile.xml
  
  Index: saveglobalprofile.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/saveglobalprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveglobalprofile.xml	9 Mar 2003 00:06:40 -0000	1.1
  +++ saveglobalprofile.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -4,7 +4,7 @@
   
   -->
   <userdelta xmlns:source="http://apache.org/cocoon/source/1.0"
  -           xmlns:session="http://cocoon.apache.org/session/1.0">
  +           xmlns:session="http://apache.org/cocoon/session/1.0">
       <source:insert>
           <source:source>profiles/globalprofile.xml</source:source>
       	  <source:path>/</source:path>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-newuser.xml
  
  Index: sunrise-newuser.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/sunrise-newuser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-newuser.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ sunrise-newuser.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -6,7 +6,7 @@
   -->
   
   <adduser xmlns:source="http://apache.org/cocoon/source/1.0"
  -         xmlns:session="http://cocoon.apache.org/session/1.0">
  +         xmlns:session="http://apache.org/cocoon/session/1.0">
   	<!-- add to authentication users -->
   	<source:insert>
       		<source:source>resources/sunrise-user.xml</source:source>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/userprofile.xml
  
  Index: userprofile.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/userprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userprofile.xml	9 Mar 2003 00:06:41 -0000	1.1
  +++ userprofile.xml	18 May 2003 11:42:12 -0000	1.2
  @@ -2,7 +2,7 @@
   <!-- $Id$ 
   
   -->
  -<userdelta xmlns:session="http://cocoon.apache.org/session/1.0"
  +<userdelta xmlns:session="http://apache.org/cocoon/session/1.0"
              xmlns:cinclude="http://apache.org/cocoon/include/1.0">
   
       <cinclude:includexml ignoreErrors="true">
  
  
  
  1.2       +2 -2      cocoon-2.0/src/documentation/xdocs/developing/webapps/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/developing/webapps/portal.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portal.xml	9 Mar 2003 00:00:55 -0000	1.1
  +++ portal.xml	18 May 2003 11:42:13 -0000	1.2
  @@ -1184,7 +1184,7 @@
             customization view for a coplet. The following example dispalys a form for a
             mail coplet which requires the configuration for a mail host, a user name and a
             password.</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;!-- Define a form --&gt;
     &lt;session:form name="popmail" method="POST"&gt;
       &lt;session:action&gt;
  @@ -1208,7 +1208,7 @@
           <p>Writing the resource for the coplet is as easy. The coplet can use
             the <em>getxml</em> command to retrieve to configuration from the
             <em>portal</em> context:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;!-- Get the configuration information out of the portal context --&gt;
     &lt;!-- and feed it into the getmail command --&gt;
     &lt;session:getmail&gt;
  
  
  
  1.2       +7 -7      cocoon-2.0/src/documentation/xdocs/developing/webapps/session.xml
  
  Index: session.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/developing/webapps/session.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- session.xml	9 Mar 2003 00:00:56 -0000	1.1
  +++ session.xml	18 May 2003 11:42:13 -0000	1.2
  @@ -62,7 +62,7 @@
             in the sitemap and can be used inside a document. All tags must be prefixed
             with the session namespace. So the actual tag used in the document will read
             <em>&lt;session:xxxx&gt;</em>. The current namespace URI for the session 
  -          transformer is <em>"http://cocoon.apache.org/session/1.0"</em>.</p>
  +          transformer is <em>"http://apache.org/cocoon/session/1.0"</em>.</p>
        </s2>
        <s2 title="Context-Tags">
           <p>A context is basically an application specific block of XML data in
  @@ -118,7 +118,7 @@
             <p>The following example shows the use of several commands and in
                particular how the <em>mergexml</em> command can be used to manipulate context
                data.</p>
  -          <source>&lt;resource xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +          <source>&lt;resource xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;session:createcontext name="trackdemo"/&gt;
     &lt;!-- build context data --&gt;
     &lt;session:setxml context="trackdemo" path="/"&gt;
  @@ -370,7 +370,7 @@
           <p>The "form-handling-page" is a pipeline which is declared in the
             sitemap and uses the session transformer. It could also read the following
             xml:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;forename&gt;
       &lt;session:getxml context="request" path="/parameter/forename"/&gt;
     &lt;/forename&gt;
  @@ -383,7 +383,7 @@
             inserts the value submitted by the user into the xml stream.</p>
           <p>If you want to write the information in a session context, you must
             wrap the whole xml inside a setxml:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;session:setxml context="userdata" path="/user"&gt;
       &lt;forename&gt;
         &lt;session:getxml context="request" path="/parameter/forename"/&gt;
  @@ -409,7 +409,7 @@
             and in addition the information about where the submitted values should be
             stored inside the session.</p>
           <p>The example from the previous chapter could look like this:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;session:form name="myform"&gt;
       &lt;session:action&gt;the-next-page&lt;/session:action&gt;
       &lt;session:content&gt;
  @@ -426,7 +426,7 @@
             contains form values which should be stored in the specified context under the
             given path. The session transformer transforms by removing the namespace and
             the context attribute:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;form action="the-next-page"&gt;
       &lt;inputxml name="forename" type="text"/&gt;
       &lt;inputxml name="surname" type="text"/&gt;
  @@ -442,7 +442,7 @@
           <p>For editing values - if the context already contains information
             about the user - <em>inputxml</em> inserts the current value inside the tag. So
             the xml streamed would after a second run would look like this:</p>
  -        <source>&lt;page xmlns:session="http://cocoon.apache.org/session/1.0"&gt;
  +        <source>&lt;page xmlns:session="http://apache.org/cocoon/session/1.0"&gt;
     &lt;form action="the-next-page"&gt;
       &lt;inputxml name="forename" type="text"&gt;Walter&lt;/inputxml&gt;
       &lt;inputxml name="surname" type="text"&gt;Walterson&lt;/inputxml&gt;
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/portal.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portal.xml	9 Mar 2003 00:06:43 -0000	1.1
  +++ portal.xml	18 May 2003 11:42:13 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   <!-- $Id$ 
   -->
  -<page xmlns:session="http://cocoon.apache.org/session/1.0">
  +<page xmlns:session="http://apache.org/cocoon/session/1.0">
   	<pageset columns="*" rows="118,*">
   		<part title="Header" scrolling="no">
   			<url>sunspotdemo-header</url>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/sunletconfig-customnews.xml
  
  Index: sunletconfig-customnews.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/sunletconfig-customnews.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunletconfig-customnews.xml	9 Mar 2003 00:06:44 -0000	1.1
  +++ sunletconfig-customnews.xml	18 May 2003 11:42:13 -0000	1.2
  @@ -2,7 +2,7 @@
   <!-- $Id$ 
   
   -->
  -<page xmlns:session="http://cocoon.apache.org/session/1.0">
  +<page xmlns:session="http://apache.org/cocoon/session/1.0">
   	<session:form name="customnews" method="POST">
   		<session:action><session:getxml context="portal" path="/configuration/uri"/></session:action>
   		<session:content>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/sunlet-customnews.xml
  
  Index: sunlet-customnews.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/samples/portal-fw/resources/auth/sunlet-customnews.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunlet-customnews.xml	9 Mar 2003 00:06:43 -0000	1.1
  +++ sunlet-customnews.xml	18 May 2003 11:42:13 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   <!-- $Id$ 
   -->
  -<p xmlns:session="http://cocoon.apache.org/session/1.0"
  +<p xmlns:session="http://apache.org/cocoon/session/1.0"
      xmlns:cinclude="http://apache.org/cocoon/include/1.0">
       <cinclude:includexml ignoreErrors="true">
   		<cinclude:src>
  
  
  
  1.2       +2 -2      cocoon-2.0/src/java/org/apache/cocoon/webapps/session/SessionConstants.java
  
  Index: SessionConstants.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/webapps/session/SessionConstants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SessionConstants.java	9 Mar 2003 00:03:40 -0000	1.1
  +++ SessionConstants.java	18 May 2003 11:42:13 -0000	1.2
  @@ -59,7 +59,7 @@
   public interface SessionConstants {
   
       /** The namespace used by the session transformers */
  -    String SESSION_NAMESPACE_URI = "http://cocoon.apache.org/session/1.0";
  +    String SESSION_NAMESPACE_URI = "http://apache.org/cocoon/session/1.0";
   
       /** Reserved Context: Request context */
       String REQUEST_CONTEXT = "request";