cziegeler 02/05/09 22:48:25
Modified: src/java/org/apache/cocoon/webapps/session/transformation
SourceWritingTransformer.java
src/webapp/sunspotdemo/resources saveglobalprofile.xml
saveroleprofile.xml saveuserprofile.xml
saveuserstatus.xml sunrise-changeuser.xml
sunrise-delrole.xml sunrise-deluser.xml
sunrise-newrole.xml sunrise-newuser.xml
Log:
Renamed file element to source which is more appropriate
Revision Changes Path
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SourceWritingTransformer.java
Index: SourceWritingTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SourceWritingTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceWritingTransformer.java 8 May 2002 07:55:50 -0000 1.1
+++ SourceWritingTransformer.java 10 May 2002 05:48:25 -0000 1.2
@@ -224,7 +224,7 @@
public static final String REPLACE_ELEMENT = "replace";
- public static final String FILE_ELEMENT = "file";
+ public static final String SOURCE_ELEMENT = "source";
public static final String REINSERT_ELEMENT = "reinsert";
@@ -345,7 +345,7 @@
// Element: file
- } else if (name.equals(FILE_ELEMENT)
+ } else if (name.equals(SOURCE_ELEMENT)
&& this.state == STATE_INSERT) {
this.state = STATE_FILE;
this.startTextRecording();
@@ -496,7 +496,7 @@
reinsert);
// Element: file
- } else if (name.equals(FILE_ELEMENT) == true && this.state == STATE_FILE) {
+ } else if (name.equals(SOURCE_ELEMENT) == true && this.state == STATE_FILE)
{
this.state = STATE_INSERT;
this.stack.push(this.endTextRecording());
this.stack.push("FILE");
1.4 +2 -2
xml-cocoon2/src/webapp/sunspotdemo/resources/saveglobalprofile.xml
Index: saveglobalprofile.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveglobalprofile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- saveglobalprofile.xml 8 May 2002 07:55:51 -0000 1.3
+++ saveglobalprofile.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<!-- $Id: saveglobalprofile.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: saveglobalprofile.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: This resource saves the global delta.
-->
<userdelta xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<source:insert>
- <source:file>sunspotdemo/profiles/globalprofile.xml</source:file>
+ <source:source>sunspotdemo/profiles/globalprofile.xml</source:file>
<source:path>/</source:path>
<source:fragment><session:getxml context="request"
path="/parameter/content"/></source:fragment>
<source:replace>global-delta</source:replace>
1.4 +2 -2 xml-cocoon2/src/webapp/sunspotdemo/resources/saveroleprofile.xml
Index: saveroleprofile.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveroleprofile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- saveroleprofile.xml 8 May 2002 07:55:51 -0000 1.3
+++ saveroleprofile.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<!-- $Id: saveroleprofile.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: saveroleprofile.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: This resource saves the role profile delta to a file with the name of
the role.
-->
<userdelta xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<session:source>
- <source:file>sunspotdemo/profiles/roleprofile-<session:getxml
context="request" path="/parameter/role"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/roleprofile-<session:getxml
context="request" path="/parameter/role"/>.xml</source:source>
<source:path>/</source:path>
<source:fragment><session:getxml context="request"
path="/parameter/content"/></source:fragment>
<source:replace>role-delta</source:replace>
1.4 +2 -2 xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserprofile.xml
Index: saveuserprofile.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserprofile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- saveuserprofile.xml 8 May 2002 07:55:51 -0000 1.3
+++ saveuserprofile.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: saveuserprofile.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: saveuserprofile.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: This resource save the user profile delta to a file with the name of
the user.
@@ -8,7 +8,7 @@
<userdelta xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<source:insert>
- <source:file>sunspotdemo/profiles/userprofile-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/userprofile-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:source>
<source:path>/</source:path>
<source:fragment><session:getxml context="request"
path="/parameter/content"/></source:fragment>
<source:replace>user-delta</source:replace>
1.4 +2 -2 xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserstatus.xml
Index: saveuserstatus.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserstatus.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- saveuserstatus.xml 8 May 2002 07:55:51 -0000 1.3
+++ saveuserstatus.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: saveuserstatus.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: saveuserstatus.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: This resource save the user status profile to a file with the name of
the user.
@@ -7,7 +7,7 @@
<userdelta xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<source:insert>
- <source:file>sunspotdemo/profiles/userstatus-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/userstatus-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:source>
<source:path>/</source:path>
<source:fragment><session:getxml context="request"
path="/parameter/content"/></source:fragment>
<source:replace>status-profile</source:replace>
1.4 +2 -2
xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-changeuser.xml
Index: sunrise-changeuser.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-changeuser.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunrise-changeuser.xml 8 May 2002 07:55:51 -0000 1.3
+++ sunrise-changeuser.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sunrise-changeuser.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: sunrise-changeuser.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: Add a new user
@@ -9,7 +9,7 @@
xmlns:session="http://cocoon.apache.org/session/1.0";>
<!-- add to authentication users -->
<source:insert>
- <source:file>sunspotdemo/resources/sunrise-user.xml</source:file>
+ <source:source>sunspotdemo/resources/sunrise-user.xml</source:file>
<source:path>/authentication/users</source:path>
<source:fragment>
<user>
1.4 +3 -3 xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-delrole.xml
Index: sunrise-delrole.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-delrole.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunrise-delrole.xml 8 May 2002 07:55:51 -0000 1.3
+++ sunrise-delrole.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sunrise-delrole.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: sunrise-delrole.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: Delete a role
@@ -8,14 +8,14 @@
<addrole xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<source:insert>
- <source:file>sunspotdemo/resources/sunrise-roles.xml</source:file>
+ <source:source>sunspotdemo/resources/sunrise-roles.xml</source:source>
<source:path>roles</source:path>
<source:fragment></source:fragment>
<source:replace>role[. = '<session:getxml context="request"
path="/parameter/role"/>']</source:replace>
</source:insert>
<!-- delete role profile -->
<source:insert>
- <source:file>sunspotdemo/profiles/roleprofile-<session:getxml
context="request" path="/parameter/role"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/roleprofile-<session:getxml
context="request" path="/parameter/role"/>.xml</source:source>
<source:path>/</session:path>
<source:fragment><role-delta/>
</source:fragment>
1.4 +4 -4 xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-deluser.xml
Index: sunrise-deluser.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-deluser.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunrise-deluser.xml 8 May 2002 07:55:51 -0000 1.3
+++ sunrise-deluser.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sunrise-deluser.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: sunrise-deluser.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: Delete a user
-->
@@ -8,7 +8,7 @@
xmlns:session="http://cocoon.apache.org/session/1.0";>
<!-- delete from authentication users -->
<source:insert>
- <source:file>sunspotdemo/resources/sunrise-user.xml</source:file>
+ <source:source>sunspotdemo/resources/sunrise-user.xml</source:source>
<source:path>/authentication/users</source:path>
<source:fragment>
</source:fragment>
@@ -16,7 +16,7 @@
</source:insert>
<!-- delete user profile -->
<source:insert>
- <source:file>sunspotdemo/profiles/userprofile-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/userprofile-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:source>
<source:path>/</source:path>
<source:fragment><user-delta/>
</source:fragment>
@@ -24,7 +24,7 @@
</source:insert>
<!-- delete user status profile -->
<source:insert>
- <source:file>sunspotdemo/profiles/userstatus-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:file>
+ <source:source>sunspotdemo/profiles/userstatus-<session:getxml
context="request" path="/parameter/ID"/>.xml</source:source>
<source:path>/</source:path>
<source:fragment><user-delta/>
</source:fragment>
1.4 +2 -2 xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newrole.xml
Index: sunrise-newrole.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newrole.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunrise-newrole.xml 8 May 2002 07:55:51 -0000 1.3
+++ sunrise-newrole.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sunrise-newrole.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: sunrise-newrole.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: Add a new role
@@ -8,7 +8,7 @@
<addrole xmlns:source="http://apache.org/cocoon/source/1.0";
xmlns:session="http://cocoon.apache.org/session/1.0";>
<source:insert>
- <source:file>sunspotdemo/resources/sunrise-roles.xml</source:file>
+ <source:source>sunspotdemo/resources/sunrise-roles.xml</source:source>
<source:path>roles</source:path>
<source:fragment><role><session:getxml context="request"
path="/parameter/role"/></role></source:fragment>
</source:insert>
1.4 +2 -2 xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newuser.xml
Index: sunrise-newuser.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newuser.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunrise-newuser.xml 8 May 2002 07:55:51 -0000 1.3
+++ sunrise-newuser.xml 10 May 2002 05:48:25 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sunrise-newuser.xml,v 1.3 2002/05/08 07:55:51 cziegeler Exp $
+<!-- $Id: sunrise-newuser.xml,v 1.4 2002/05/10 05:48:25 cziegeler Exp $
Description: Add a new user
@@ -9,7 +9,7 @@
xmlns:session="http://cocoon.apache.org/session/1.0";>
<!-- add to authentication users -->
<source:insert>
- <source:file>sunspotdemo/resources/sunrise-user.xml</source:file>
+ <source:source>sunspotdemo/resources/sunrise-user.xml</source:source>
<source:path>/authentication/users</source:path>
<source:fragment>
<user>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
