stephan 2003/03/07 05:16:29
Modified: src/blocks/slide/samples description2html4content.xsl
description2html4locks.xsl
description2html4permissions.xsl
description2html4properties.xsl sitemap.xmap
Log:
Correct some prefixes problems.
Revision Changes Path
1.2 +25 -25
xml-cocoon2/src/blocks/slide/samples/description2html4content.xsl
Index: description2html4content.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/slide/samples/description2html4content.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- description2html4content.xsl 31 Jan 2003 18:08:44 -0000 1.1
+++ description2html4content.xsl 7 Mar 2003 13:16:28 -0000 1.2
@@ -26,24 +26,24 @@
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
align="center" width="100%">
<tr>
<td width="90%" align="left" bgcolor="#0086b2"><font size="+1"
face="arial,helvetica,sanserif"
- color="#ffffff"><xsl:value-of select="source:source/@source:uri"/></font></td>
+ color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/users/">
<i>users</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/content/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
<i>content</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/properties/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
<i>properties</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
<i>permissions</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/locks/{substring-after(source:source/@source:uri,'://')}">
+ href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
<i>locks</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/logout.html">
@@ -84,10 +84,10 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"
width="100%" align="center">
- <xsl:if test="@source:parent">
+ <xsl:if test="@parent">
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
- <a
href="/cocoon/samples/slide/content/{substring-after(@source:parent,'://')}">Back</a>
+ <a
href="/cocoon/samples/slide/content/{substring-after(@parent,'://')}">Back</a>
</td>
</tr>
</xsl:if>
@@ -100,8 +100,8 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<font size="+0" face="arial,helvetica,sanserif" color="#000000">
- <a
href="/cocoon/samples/slide/content/{substring-after(@source:uri,'://')}"
- ><xsl:value-of select="@source:name"/></a>
+ <a
href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}"
+ ><xsl:value-of select="@name"/></a>
</font>
</td>
</tr>
@@ -134,7 +134,7 @@
<td width="100%" bgcolor="#ffffff" align="left">
<xsl:choose>
- <xsl:when test="@source:collection='true'">
+ <xsl:when test="@collection='true'">
<table width="100%" cellspacing="0" cellpadding="5" align="center">
<font size="+0" face="arial,helvetica,sanserif" color="#000000">
@@ -149,19 +149,19 @@
<xsl:for-each select="source:children/source:source">
<tr>
<td align="left">  
- <a
href="/cocoon/samples/slide/content/{substring-after(@source:uri,'://')}"
- ><xsl:value-of select="@source:name"/></a>
+ <a
href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}"
+ ><xsl:value-of select="@name"/></a>
</td>
<td align="left"><xsl:value-of
- select="@source:mime-type"/></td>
+ select="@mime-type"/></td>
<td align="left"><xsl:value-of
- select="@source:contentlength"/></td>
+ select="@contentlength"/></td>
<td align="left"><xsl:value-of
select="source:properties/dav:getlastmodified"/></td>
<td align="right">
<form action="" method="post">
<input type="hidden" name="method" value="doDeleteSource"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<input type="submit" name="cocoon-action-deletesource"
value="Delete"/>
</form>
</td>
@@ -171,7 +171,7 @@
<tr>
<form action="" method="post" enctype="multipart/form-data">
<input type="hidden" name="method" value="doUploadSource"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left">
<input type="text" name="cocoon-source-name" size="15"
maxlength="40"/>(optional)
</td>
@@ -188,7 +188,7 @@
<tr>
<form action="" method="post">
<input type="hidden" name="method" value="doCreateCollection"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left" colspan="4">
<input type="text" name="cocoon-source-name" size="15"
maxlength="40"/>
</td>
@@ -201,23 +201,23 @@
</table>
</xsl:when>
- <xsl:when test="@source:mime-type='image/gif'">
- <img
src="/cocoon/samples/slide/view/{substring-after(@source:uri,'://')}"/>
+ <xsl:when test="@mime-type='image/gif'">
+ <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
</xsl:when>
- <xsl:when test="@source:mime-type='image/jpeg'">
- <img
src="/cocoon/samples/slide/view/{substring-after(@source:uri,'://')}"/>
+ <xsl:when test="@mime-type='image/jpeg'">
+ <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
</xsl:when>
- <xsl:when test="@source:mime-type='text/plain'">
+ <xsl:when test="@mime-type='text/plain'">
<pre>
- <xi:include href="[EMAIL
PROTECTED]:uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
+ <xi:include href="[EMAIL PROTECTED]" parse="text"/>
</pre>
</xsl:when>
- <xsl:when test="@source:mime-type='text/xml'">
+ <xsl:when test="@mime-type='text/xml'">
<pre>
- <xi:include href="[EMAIL
PROTECTED]:uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
+ <xi:include href="[EMAIL PROTECTED]" parse="text"/>
</pre>
</xsl:when>
1.2 +11 -11 xml-cocoon2/src/blocks/slide/samples/description2html4locks.xsl
Index: description2html4locks.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/slide/samples/description2html4locks.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- description2html4locks.xsl 31 Jan 2003 18:08:44 -0000 1.1
+++ description2html4locks.xsl 7 Mar 2003 13:16:28 -0000 1.2
@@ -23,24 +23,24 @@
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
align="center" width="100%">
<tr>
<td width="90%" align="left" bgcolor="#0086b2"><font size="+1"
face="arial,helvetica,sanserif"
- color="#ffffff"><xsl:value-of select="source:source/@source:uri"/></font></td>
+ color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/users/">
<i>users</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/content/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
<i>content</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/properties/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
<i>properties</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
<i>permissions</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/locks/{substring-after(source:source/@source:uri,'://')}">
+ href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
<i>locks</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/logout.html">
@@ -81,10 +81,10 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"
width="100%" align="center">
- <xsl:if test="@source:parent">
+ <xsl:if test="@parent">
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
- <a
href="/cocoon/samples/slide/locks/{substring-after(@source:parent,'://')}">Back</a>
+ <a
href="/cocoon/samples/slide/locks/{substring-after(@parent,'://')}">Back</a>
</td>
</tr>
</xsl:if>
@@ -97,8 +97,8 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<font size="+0" face="arial,helvetica,sanserif" color="#000000">
- <a
href="/cocoon/samples/slide/locks/{substring-after(@source:uri,'://')}"
- ><xsl:value-of select="@source:name"/></a>
+ <a href="/cocoon/samples/slide/locks/{substring-after(@uri,'://')}"
+ ><xsl:value-of select="@name"/></a>
</font>
</td>
</tr>
@@ -150,7 +150,7 @@
<td align="right">
<form action="" method="post">
<input type="hidden" name="method" value="doDeleteLock"/>
- <input type="hidden" name="cocoon-source-uri"
value="{../../@source:uri}"/>
+ <input type="hidden" name="cocoon-source-uri"
value="{../../@uri}"/>
<input type="hidden" name="cocoon-lock-subject" value="[EMAIL
PROTECTED]"/>
<input type="submit" name="cocoon-action-deletelock"
value="Delete"/>
@@ -162,7 +162,7 @@
<tr>
<form action="" method="post">
<input type="hidden" name="method" value="doAddLock"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left">
<input name="cocoon-lock-subject" type="text" size="20"
maxlength="40"/>
</td>
1.2 +13 -13
xml-cocoon2/src/blocks/slide/samples/description2html4permissions.xsl
Index: description2html4permissions.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/slide/samples/description2html4permissions.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- description2html4permissions.xsl 31 Jan 2003 18:08:44 -0000 1.1
+++ description2html4permissions.xsl 7 Mar 2003 13:16:28 -0000 1.2
@@ -24,24 +24,24 @@
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
align="center" width="100%">
<tr>
<td width="90%" align="left" bgcolor="#0086b2"><font size="+1"
face="arial,helvetica,sanserif"
- color="#ffffff"><xsl:value-of
select="document/source:source/@source:uri"/></font></td>
+ color="#ffffff"><xsl:value-of select="document/source:source/@uri"/></font></td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/users/">
<i>users</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/content/{substring-after(document/source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/content/{substring-after(document/source:source/@uri,'://')}">
<i>content</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/properties/{substring-after(document/source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/properties/{substring-after(document/source:source/@uri,'://')}">
<i>properties</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/permissions/{substring-after(document/source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/permissions/{substring-after(document/source:source/@uri,'://')}">
<i>permissions</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/locks/{substring-after(document/source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/locks/{substring-after(document/source:source/@uri,'://')}">
<i>locks</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/logout.html">
@@ -82,10 +82,10 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"
width="100%" align="center">
- <xsl:if test="@source:parent">
+ <xsl:if test="@parent">
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
- <a
href="/cocoon/samples/slide/permissions/{substring-after(@source:parent,'://')}">Back</a>
+ <a
href="/cocoon/samples/slide/permissions/{substring-after(@parent,'://')}">Back</a>
</td>
</tr>
</xsl:if>
@@ -98,8 +98,8 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<font size="+0" face="arial,helvetica,sanserif" color="#000000">
- <a
href="/cocoon/samples/slide/permissions/{substring-after(@source:uri,'://')}"
- ><xsl:value-of select="@source:name"/></a>
+ <a
href="/cocoon/samples/slide/permissions/{substring-after(@uri,'://')}"
+ ><xsl:value-of select="@name"/></a>
</font>
</td>
</tr>
@@ -149,7 +149,7 @@
<td align="right">
<form action="" method="post">
<input type="hidden" name="method"
value="doRemovePrincipalPermission"/>
- <input type="hidden" name="cocoon-source-uri"
value="{../../@source:uri}"/>
+ <input type="hidden" name="cocoon-source-uri"
value="{../../@uri}"/>
<input type="hidden" name="cocoon-source-permission-principal"
value="[EMAIL PROTECTED]"/>
<input type="hidden" name="cocoon-source-permission-privilege"
value="[EMAIL PROTECTED]"/>
<input type="hidden" name="cocoon-source-permission-inheritable"
value="[EMAIL PROTECTED]"/>
@@ -164,7 +164,7 @@
<tr>
<form action="" method="post">
<input type="hidden" name="method"
value="doAddPrincipalPermission"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left">
<select name="cocoon-source-permission-principal">
<option>ALL</option>
@@ -259,7 +259,7 @@
<td align="right">
<form action="" method="post">
<input type="hidden" name="method"
value="doRemovePrincipalGroupPermission"/>
- <input type="hidden" name="cocoon-source-uri"
value="{../../@source:uri}"/>
+ <input type="hidden" name="cocoon-source-uri"
value="{../../@uri}"/>
<input type="hidden"
name="cocoon-source-permission-principal-group" value="[EMAIL PROTECTED]"/>
<input type="hidden" name="cocoon-source-permission-privilege"
value="[EMAIL PROTECTED]"/>
<input type="hidden" name="cocoon-source-permission-inheritable"
value="[EMAIL PROTECTED]"/>
@@ -274,7 +274,7 @@
<tr>
<form action="" method="post">
<input type="hidden" name="method"
value="doAddPrincipalGroupPermission"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left">
<select name="cocoon-source-permission-principal-group">
<xsl:for-each select="/document/pl:list/pl:group">
1.2 +12 -12
xml-cocoon2/src/blocks/slide/samples/description2html4properties.xsl
Index: description2html4properties.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/slide/samples/description2html4properties.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- description2html4properties.xsl 31 Jan 2003 18:08:44 -0000 1.1
+++ description2html4properties.xsl 7 Mar 2003 13:16:28 -0000 1.2
@@ -23,24 +23,24 @@
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
align="center" width="100%">
<tr>
<td width="90%" align="left" bgcolor="#0086b2"><font size="+1"
face="arial,helvetica,sanserif"
- color="#ffffff"><xsl:value-of select="source:source/@source:uri"/></font></td>
+ color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/users/">
<i>users</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/content/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
<i>content</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/properties/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
<i>properties</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@source:uri,'://')}">
+
href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
<i>permissions</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
-
href="/cocoon/samples/slide/locks/{substring-after(source:source/@source:uri,'://')}">
+ href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
<i>locks</i></a>
</td>
<td nowrap="nowrap" bgcolor="#ffffff"><a
href="/cocoon/samples/slide/logout.html">
@@ -81,10 +81,10 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"
width="100%" align="center">
- <xsl:if test="@source:parent">
+ <xsl:if test="@parent">
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
- <a
href="/cocoon/samples/slide/properties/{substring-after(@source:parent,'://')}">Back</a>
+ <a
href="/cocoon/samples/slide/properties/{substring-after(@parent,'://')}">Back</a>
</td>
</tr>
</xsl:if>
@@ -97,8 +97,8 @@
<tr>
<td width="100%" bgcolor="#ffffff" align="left">
<font size="+0" face="arial,helvetica,sanserif" color="#000000">
- <a
href="/cocoon/samples/slide/properties/{substring-after(@source:uri,'://')}"
- ><xsl:value-of select="@source:name"/></a>
+ <a
href="/cocoon/samples/slide/properties/{substring-after(@uri,'://')}"
+ ><xsl:value-of select="@name"/></a>
</font>
</td>
</tr>
@@ -148,10 +148,10 @@
<td align="left"><xsl:value-of select="local-name(.)"/></td>
<td align="left"><xsl:value-of select="."/></td>
<td align="right">
- <xsl:if test="namespace-uri()!='DAV:' and ../@source:type='live'">
+ <xsl:if test="namespace-uri()!='DAV:' and ../@type='live'">
<form action="" method="post">
<input type="hidden" name="method" value="doDeleteProperty"/>
- <input type="hidden" name="cocoon-source-uri"
value="{../../@source:uri}"/>
+ <input type="hidden" name="cocoon-source-uri"
value="{../../@uri}"/>
<input type="hidden" name="cocoon-source-property-namespace"
value="{namespace-uri()}"/>
<input type="hidden" name="cocoon-source-property-name"
value="{local-name()}"/>
@@ -165,7 +165,7 @@
<tr>
<form action="" method="post">
<input type="hidden" name="method" value="doAddProperty"/>
- <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]:uri}"/>
+ <input type="hidden" name="cocoon-source-uri" value="[EMAIL
PROTECTED]"/>
<td align="left">
<input name="cocoon-source-property-namespace" type="text"
size="15" maxlength="40"/>
</td>
1.7 +3 -3 xml-cocoon2/src/blocks/slide/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/slide/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 5 Mar 2003 18:48:00 -0000 1.6
+++ sitemap.xmap 7 Mar 2003 13:16:28 -0000 1.7
@@ -81,7 +81,7 @@
<map:resources>
<map:resource name="description">
- <map:generate type="sourcedescription"
src="slide:/{1}?cocoon-source-principal={../../ID}">
+ <map:generate type="sourcedescription"
src="slide://{1}?cocoon-source-principal={../../ID}">
<map:parameter name="repository" value="slide"/>
<map:parameter name="namespace" value="myrepository"/>
<map:parameter name="properties" value="true"/>
@@ -128,7 +128,7 @@
<!-- ============= Source description ============= -->
<map:match pattern="description/*/**">
- <map:generate type="sourcedescription"
src="slide:/{2}?cocoon-source-principal={1}">
+ <map:generate type="sourcedescription"
src="slide://{2}?cocoon-source-principal={1}">
<map:parameter name="repository" value="slide"/>
<map:parameter name="namespace" value="myrepository"/>
<map:parameter name="properties" value="true"/>
@@ -248,7 +248,7 @@
<!-- ============= Source direct ================== -->
<map:match pattern="view/**">
- <map:read src="slide:/{1}?cocoon-source-principal={../ID}"/>
+ <map:read src="slide://{1}?cocoon-source-principal={../ID}"/>
</map:match>
<!-- ============= Repository users =============== -->
