cziegeler 2002/09/25 06:48:40
Modified: src/java/org/apache/cocoon/webapps/session/transformation
SessionPreTransformer.java
src/webapp/samples/portal/resources/auth
sunlet-customnews.xml
src/webapp/samples/portal sitemap.xmap
src/webapp/samples/portal/resources sunrise-loaduser.xml
userprofile.xml userstatus.xml
. changes.xml
Removed: src/java/org/apache/cocoon/webapps/session/transformation
ConnectTransformer.java
Log:
Removing include from session transformer and migrating to cinclude
Revision Changes Path
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
Index: SessionPreTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionPreTransformer.java 25 Sep 2002 12:03:08 -0000 1.3
+++ SessionPreTransformer.java 25 Sep 2002 13:48:40 -0000 1.4
@@ -76,7 +76,7 @@
* @version CVS $Id$
*/
public class SessionPreTransformer
-extends ConnectTransformer {
+extends AbstractSessionTransformer {
/*
* The XML commands
1.2 +8 -9
xml-cocoon2/src/webapp/samples/portal/resources/auth/sunlet-customnews.xml
Index: sunlet-customnews.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/samples/portal/resources/auth/sunlet-customnews.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunlet-customnews.xml 3 Jun 2002 11:45:54 -0000 1.1
+++ sunlet-customnews.xml 25 Sep 2002 13:48:40 -0000 1.2
@@ -1,12 +1,11 @@
<?xml version="1.0"?>
<!-- $Id$
-->
-<p xmlns:session="http://cocoon.apache.org/session/1.0";>
- <session:include>
- <session:connection>
- <session:target>
-
http://p.moreover.com/cgi-local/page?index_<session:getxml context="portal"
path="/coplet-data/feed"/>+xml
- </session:target>
- </session:connection>
- </session:include>
+<p xmlns:session="http://cocoon.apache.org/session/1.0";
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
+ <cinclude:includexml ignoreErrors="true">
+ <cinclude:src>
+ http://p.moreover.com/cgi-local/page?index_<session:getxml
context="portal" path="/coplet-data/feed"/>+xml
+ </cinclude:src>
+ </cinclude:includexml>
</p>
1.9 +1 -0 xml-cocoon2/src/webapp/samples/portal/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/portal/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sitemap.xmap 25 Sep 2002 13:30:13 -0000 1.8
+++ sitemap.xmap 25 Sep 2002 13:48:40 -0000 1.9
@@ -158,6 +158,7 @@
<map:match pattern="sunspotdemosunlet-customnews">
<map:generate
src="resources/auth/sunlet-customnews.xml"/>
<map:transform type="session"/>
+ <map:transform type="cinclude"/>
<map:transform src="styles/sunLet_MoreoverDotCom.xsl"/>
<map:serialize type="xml"/>
</map:match>
1.2 +6 -7
xml-cocoon2/src/webapp/samples/portal/resources/sunrise-loaduser.xml
Index: sunrise-loaduser.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/samples/portal/resources/sunrise-loaduser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunrise-loaduser.xml 3 Jun 2002 11:45:54 -0000 1.1
+++ sunrise-loaduser.xml 25 Sep 2002 13:48:40 -0000 1.2
@@ -4,15 +4,14 @@
Description: load u user
-->
-<loaduser xmlns:session="http://cocoon.apache.org/session/1.0";>
+<loaduser xmlns:session="http://cocoon.apache.org/session/1.0";
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
<info>
<ID><session:getxml context="request" path="/parameter/ID"/></ID>
<role><session:getxml context="request" path="/parameter/role"/></role>
<type><session:getxml context="request" path="/parameter/type"/></type>
</info>
- <session:include xmlns:session="http://cocoon.apache.org/session/1.0";
ignoreErrors="true">
- <session:connection>
- <session:target>resources/sunrise-user.xml</session:target>
- </session:connection>
- </session:include>
+ <cinclude:includexml ignoreErrors="true">
+ <cinclude:src>resources/sunrise-user.xml</cinclude:src>
+ </cinclude:includexml>
</loaduser>
1.2 +7 -7 xml-cocoon2/src/webapp/samples/portal/resources/userprofile.xml
Index: userprofile.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/portal/resources/userprofile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userprofile.xml 3 Jun 2002 11:45:54 -0000 1.1
+++ userprofile.xml 25 Sep 2002 13:48:40 -0000 1.2
@@ -2,10 +2,10 @@
<!-- $Id$
-->
-<userdelta>
-<session:include xmlns:session="http://cocoon.apache.org/session/1.0";
ignoreErrors="true">
- <session:connection>
- <session:target>profiles/userprofile-<session:getxml context="request"
path="/parameter/ID"/>.xml</session:target>
- </session:connection>
-</session:include>
+<userdelta xmlns:session="http://cocoon.apache.org/session/1.0";
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
+
+ <cinclude:includexml ignoreErrors="true">
+ <cinclude:src>profiles/userprofile-<session:getxml context="request"
path="/parameter/ID"/>.xml</cinclude:src>
+ </cinclude:includexml>
</userdelta>
1.2 +7 -7 xml-cocoon2/src/webapp/samples/portal/resources/userstatus.xml
Index: userstatus.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/portal/resources/userstatus.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userstatus.xml 3 Jun 2002 11:45:54 -0000 1.1
+++ userstatus.xml 25 Sep 2002 13:48:40 -0000 1.2
@@ -3,10 +3,10 @@
Description: Load the status profile from a file name userstatus-<username>.xml
-->
-<statusprofile>
-<session:include xmlns:session="http://cocoon.apache.org/session/1.0";
ignoreErrors="true">
- <session:connection>
- <session:target>profiles/userstatus-<session:getxml context="request"
path="/parameter/ID"/>.xml</session:target>
- </session:connection>
-</session:include>
+<statusprofile xmlns:session="http://cocoon.apache.org/session/1.0";
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
+
+ <cinclude:includexml ignoreErrors="true">
+ <cinclude:src>profiles/userstatus-<session:getxml context="request"
path="/parameter/ID"/>.xml</cinclude:src>
+ </cinclude:includexml>
</statusprofile>
1.260 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- changes.xml 25 Sep 2002 09:02:50 -0000 1.259
+++ changes.xml 25 Sep 2002 13:48:40 -0000 1.260
@@ -40,6 +40,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="update">
+ Enhancing cinclude transformer with configuration possiblities, lie
+ POST requests and flexible parameter handling.
+ </action>
<action dev="SMS" type="update" fixes-bug="12799" due-to="Philipp Schmidt"
due-to-email="[EMAIL PROTECTED]">
Enabled the RTF serializer and SWF serializer as block.
</action>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
