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:45:03 UTC
svn commit: rev 55557 - in incubator/lenya/trunk/src/webapp/lenya: . content/admin/common content/admin/groups content/admin/ipranges content/admin/users pubs/default pubs/default/resources/misc xslt/admin xslt/admin/common
Author: gregor
Date: Mon Oct 25 18:45:01 2004
New Revision: 55557
Removed:
incubator/lenya/trunk/src/webapp/lenya/content/admin/common/redirect.xsp
incubator/lenya/trunk/src/webapp/lenya/xslt/admin/common/redirect.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/admin/redirect.xsl
Modified:
incubator/lenya/trunk/src/webapp/lenya/admin.xmap
incubator/lenya/trunk/src/webapp/lenya/content/admin/groups/group-admin.js
incubator/lenya/trunk/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
incubator/lenya/trunk/src/webapp/lenya/content/admin/users/user-admin.js
incubator/lenya/trunk/src/webapp/lenya/pubs/default/resources/misc/upload.js
incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-uploaddocument.xmap
Log:
#27400
[patch] consolidate Redirect files
Modified: incubator/lenya/trunk/src/webapp/lenya/admin.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/admin.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/admin.xmap Mon Oct 25 18:45:01 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/trunk/src/webapp/lenya/content/admin/groups/group-admin.js
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/admin/groups/group-admin.js (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/admin/groups/group-admin.js Mon Oct 25 18:45:01 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/trunk/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/admin/ipranges/iprange-admin.js (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/admin/ipranges/iprange-admin.js Mon Oct 25 18:45:01 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/trunk/src/webapp/lenya/content/admin/users/user-admin.js
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/admin/users/user-admin.js (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/admin/users/user-admin.js Mon Oct 25 18:45:01 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);
}
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/resources/misc/upload.js
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/resources/misc/upload.js (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/resources/misc/upload.js Mon Oct 25 18:45:01 2004
@@ -1,27 +1,27 @@
-function uploadDocument() {
-
- var documentRoot = cocoon.parameters["documentRoot"];
-
- var cocoonFlowHelper = new Packages.org.apache.lenya.cms.cocoon.flow.FlowHelper();
- var redirectUri = cocoonFlowHelper.getRequestURI(cocoon);
- var servletContextPath = cocoonFlowHelper.getPageEnvelope(cocoon).getPublication().getServletContext();
- //var uploadHelper = new Packages.org.apache.lenya.cms.authoring.UploadHelper(documentRoot + "/authoring/al/140");
- var uploadHelper = new Packages.org.apache.lenya.cms.authoring.UploadHelper(servletContextPath + "/lenya/pubs/default/content");
-
- var uploaded = false;
- while (!uploaded) {
-
- cocoon.sendPageAndWait("form.xml", {
- "error-messages" : null,
- //"error-messages" : uploadHelper.getErrorMessages(),
- "form-title" : "Upload Document"
- });
-
- if (cocoon.request.getParameter("upload-regulation")) {
- var part = cocoon.request.get("upload-regulation");
- uploaded = uploadHelper.save(part);
- }
- }
-
- cocoon.sendPage("redirect.xml", { "url" : redirectUri });
-}
+function uploadDocument() {
+
+ var documentRoot = cocoon.parameters["documentRoot"];
+
+ var cocoonFlowHelper = new Packages.org.apache.lenya.cms.cocoon.flow.FlowHelper();
+ var redirectUri = cocoonFlowHelper.getRequestURI(cocoon);
+ var servletContextPath = cocoonFlowHelper.getPageEnvelope(cocoon).getPublication().getServletContext();
+ //var uploadHelper = new Packages.org.apache.lenya.cms.authoring.UploadHelper(documentRoot + "/authoring/al/140");
+ var uploadHelper = new Packages.org.apache.lenya.cms.authoring.UploadHelper(servletContextPath + "/lenya/pubs/default/content");
+
+ var uploaded = false;
+ while (!uploaded) {
+
+ cocoon.sendPageAndWait("form.xml", {
+ "error-messages" : null,
+ //"error-messages" : uploadHelper.getErrorMessages(),
+ "form-title" : "Upload Document"
+ });
+
+ if (cocoon.request.getParameter("upload-regulation")) {
+ var part = cocoon.request.get("upload-regulation");
+ uploaded = uploadHelper.save(part);
+ }
+ }
+
+ cocoon.redirectTo(redirectUri);
+}
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-uploaddocument.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-uploaddocument.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-uploaddocument.xmap Mon Oct 25 18:45:01 2004
@@ -1,63 +1,58 @@
-<?xml version="1.0"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <!-- =========================== Components ================================ -->
-
- <map:components/>
-
- <!-- ========== -->
- <!-- FlowScript -->
- <!-- ========== -->
-
- <map:flow language="javascript">
- <map:script src="resources/misc/upload.js"/>
- </map:flow>
-
- <!-- =========================== Pipelines ================================ -->
-
- <map:views>
- <map:view name="xml" from-label="xml">
- <map:serialize type="xml"/>
- </map:view>
- </map:views>
-
- <map:pipelines>
-
- <map:pipeline type="noncaching">
- <map:match pattern="redirect.xml">
- <map:generate src="../../content/admin/common/redirect.xsp" type="serverpages"/>
- <map:transform src="../../xslt/admin/common/redirect.xsl"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="form.xml">
- <map:generate type="serverpages" src="lenya/content/authoring/upload.xsp"/>
- <map:transform src="xslt/upload.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- </map:transform>
- <map:transform src="cocoon://lenya-screen.xsl"/>
- <map:serialize/>
- </map:match>
- </map:pipeline>
-
-
- <map:pipeline>
- <map:match type="request-parameter" pattern="lenya.continuation">
- <map:call continuation="{1}"/>
- </map:match>
- </map:pipeline>
-
-
- <map:pipeline>
- <map:match type="usecase" pattern="uploaddocument">
- <map:call function="uploadDocument">
- <map:parameter name="documentRoot" value="/foo/bar/content"/>
- </map:call>
- </map:match>
- <map:handle-errors type="500"/>
- </map:pipeline>
-
- </map:pipelines>
-
-</map:sitemap>
+<?xml version="1.0"?>
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- =========================== Components ================================ -->
+
+ <map:components/>
+
+ <!-- ========== -->
+ <!-- FlowScript -->
+ <!-- ========== -->
+
+ <map:flow language="javascript">
+ <map:script src="resources/misc/upload.js"/>
+ </map:flow>
+
+ <!-- =========================== Pipelines ================================ -->
+
+ <map:views>
+ <map:view name="xml" from-label="xml">
+ <map:serialize type="xml"/>
+ </map:view>
+ </map:views>
+
+ <map:pipelines>
+
+ <map:pipeline type="noncaching">
+
+ <map:match pattern="form.xml">
+ <map:generate type="serverpages" src="lenya/content/authoring/upload.xsp"/>
+ <map:transform src="xslt/upload.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
+ </map:transform>
+ <map:transform src="cocoon://lenya-screen.xsl"/>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
+
+
+ <map:pipeline>
+ <map:match type="request-parameter" pattern="lenya.continuation">
+ <map:call continuation="{1}"/>
+ </map:match>
+ </map:pipeline>
+
+
+ <map:pipeline>
+ <map:match type="usecase" pattern="uploaddocument">
+ <map:call function="uploadDocument">
+ <map:parameter name="documentRoot" value="/foo/bar/content"/>
+ </map:call>
+ </map:match>
+ <map:handle-errors type="500"/>
+ </map:pipeline>
+
+ </map:pipelines>
+
+</map:sitemap>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org