You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/10/26 03:46:58 UTC
svn commit: rev 55558 - in incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya: . content/admin/common content/admin/groups content/admin/ipranges content/admin/users xslt/admin xslt/admin/common
Author: gregor
Date: Mon Oct 25 18:46:57 2004
New Revision: 55558
Removed:
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/common/redirect.xsp
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/common/redirect.xsl
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/redirect.xsl
Modified:
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/admin.xmap
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js
Log:
#27400
[patch] consolidate Redirect files
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/admin.xmap
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/admin.xmap (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/admin.xmap Mon Oct 25 18:46:57 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: admin.xmap,v 1.32 2004/05/10 14:58:29 andreas Exp $ -->
+<!-- $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
@@ -125,13 +125,7 @@
<map:transform src="xslt/util/strip_namespaces.xsl"/>
<map:serialize type="html-iso-8859-1"/>
</map:match>
-
- <map:match pattern="redirect.html">
- <map:generate src="content/admin/common/redirect.xsp" type="serverpages"/>
- <map:transform src="xslt/admin/common/redirect.xsl"/>
- <map:serialize/>
- </map:match>
-
+
</map:pipeline>
<!-- =================================================================== -->
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js Mon Oct 25 18:46:57 2004
@@ -55,7 +55,7 @@
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -146,7 +146,7 @@
break;
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -204,7 +204,7 @@
break;
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -249,7 +249,7 @@
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js Mon Oct 25 18:46:57 2004
@@ -197,7 +197,7 @@
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -243,7 +243,7 @@
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -310,6 +310,6 @@
break;
}
}
- sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js Mon Oct 25 18:46:57 2004
@@ -65,7 +65,7 @@
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -151,7 +151,7 @@
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -228,7 +228,7 @@
ready = true;
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -366,7 +366,7 @@
ready = true;
}
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
finally {
release();
@@ -418,5 +418,5 @@
release();
}
- cocoon.sendPage("redirect.html", { "url" : redirectUri });
+ cocoon.redirectTo(redirectUri);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org