You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/06/28 15:04:48 UTC
svn commit: r551545 - in /lenya/trunk/src/modules:
bxe/usecases/insertAsset.jx
editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
Author: andreas
Date: Thu Jun 28 06:04:47 2007
New Revision: 551545
URL: http://svn.apache.org/viewvc?view=rev&rev=551545
Log:
Using proxy-based path for insertAsset usecase in BXE. This fixes bug 42761.
Modified:
lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
Modified: lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/usecases/insertAsset.jx?view=diff&rev=551545&r1=551544&r2=551545
==============================================================================
--- lenya/trunk/src/modules/bxe/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/bxe/usecases/insertAsset.jx Thu Jun 28 06:04:47 2007
@@ -48,15 +48,13 @@
<th style="background: none;"><i18n:text>Dimension (w x h)</i18n:text></th>
<th style="background: none;"><i18n:text>Creation Date</i18n:text></th>
</tr>
+ <jx:set var="asset2proxyUrl" value="${usecase.getParameter('asset2proxyUrl')}"/>
<jx:forEach var="asset" items="${usecase.getParameter('assets')}">
- <jx:set var="originalUrl" value="${asset.getCanonicalWebappURL()}"/>
- <jx:set var="lastDotIndex" value="${originalUrl.lastIndexOf('.')}"/>
- <jx:set var="extension" value="${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"/>
- <jx:set var="url" value="${originalUrl.substring(0, lastDotIndex).concat('.').concat(extension)}"/>
+ <jx:set var="url" value="${asset2proxyUrl.get(asset)}"/>
<tr>
<td>
<input type="radio" name="asset" value="${asset.getPath()}"
- onClick="javascript:insertData('${url}', '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/>
+ onClick="insertData('${url}', '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/>
</td>
<td><jx:out value="${asset.getPath()}"/></td>
<td>
Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java?view=diff&rev=551545&r1=551544&r2=551545
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java Thu Jun 28 06:04:47 2007
@@ -18,10 +18,16 @@
package org.apache.lenya.cms.editors;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import org.apache.cocoon.environment.Request;
import org.apache.lenya.ac.User;
+import org.apache.lenya.cms.cocoon.components.context.ContextUtility;
+import org.apache.lenya.cms.linking.LinkRewriter;
+import org.apache.lenya.cms.linking.OutgoingLinkRewriter;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -38,16 +44,16 @@
public class InsertAsset extends CreateResource {
protected static final String DOCUMENT = "document";
-
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
*/
protected void initParameters() {
super.initParameters();
-
+
deleteParameter(RELATIONS);
loadResources();
-
+
setParameter(DOCUMENT, getSourceDocument());
try {
User user = getSession().getIdentity().getUser();
@@ -58,7 +64,7 @@
throw new RuntimeException(e);
}
}
-
+
protected void doCheckPreconditions() throws Exception {
if (!ServletHelper.isUploadEnabled(manager)) {
addErrorMessage("Upload is not enabled please check local.build.properties!");
@@ -74,34 +80,56 @@
}
}
return (Document[]) list.toArray(new Document[list.size()]);
- }
-
- protected void loadResources() {
- try {
+ }
+
+ protected void loadResources() {
+ ContextUtility context = null;
+ try {
+ context = (ContextUtility) this.manager.lookup(ContextUtility.ROLE);
+ Request request = context.getRequest();
+ boolean ssl = request.isSecure();
+
+ LinkRewriter rewriter = new OutgoingLinkRewriter(this.manager, getSession(),
+ getSourceURL(), ssl, false);
+ Map asset2proxyUrl = new HashMap();
+ setParameter("asset2proxyUrl", asset2proxyUrl);
+
Document[] resources = getResourceDocuments();
List selectedResources = new ArrayList();
String mimeTypePrefix = getParameterAsString("mimeTypePrefix", "");
for (int i = 0; i < resources.length; i++) {
String resMimeType = resources[i].getMimeType();
- if(resMimeType == null)
+ if (resMimeType == null)
resMimeType = "unknown";
if (resMimeType.startsWith(mimeTypePrefix)) {
selectedResources.add(resources[i]);
}
+
+ String originalUrl = resources[i].getCanonicalWebappURL();
+ int lastDotIndex = originalUrl.lastIndexOf('.');
+ String extension = resources[i].getSourceExtension();
+ String url = originalUrl.substring(0, lastDotIndex) + "." + extension;
+
+ String proxyUrl = rewriter.rewrite(url);
+ asset2proxyUrl.put(resources[i], proxyUrl);
+
}
setParameter("assets", selectedResources);
} catch (final Exception e) {
throw new RuntimeException(e);
- }
+ } finally {
+ if (context != null) {
+ this.manager.release(context);
+ }
+ }
}
/**
- * Delegates to the main assets usecase; the name of
- * the usecase being delegated to is set in the
- * configuration parameter "asset-usecase".
- *
+ * Delegates to the main assets usecase; the name of the usecase being
+ * delegated to is set in the configuration parameter "asset-usecase".
+ *
* @see org.apache.lenya.cms.usecase.Usecase#advance()
*/
public void advance() throws UsecaseException {
@@ -113,28 +141,29 @@
String usecaseName = getParameterAsString("asset-usecase");
if (getLogger().isDebugEnabled())
- getLogger().debug("InsertAsset::advance() calling invoker with usecaseName [" + usecaseName + "]");
+ getLogger().debug(
+ "InsertAsset::advance() calling invoker with usecaseName ["
+ + usecaseName + "]");
invoker.invoke(getSourceURL(), usecaseName, getParameters());
if (invoker.getResult() == UsecaseInvoker.SUCCESS) {
loadResources();
deleteParameter("title");
deleteParameter("creator");
deleteParameter("rights");
- }
- else {
+ } else {
List messages = invoker.getErrorMessages();
- for (Iterator i = messages.iterator(); i.hasNext(); ) {
+ for (Iterator i = messages.iterator(); i.hasNext();) {
UsecaseMessage message = (UsecaseMessage) i.next();
addErrorMessage(message.getMessage());
}
}
/*
- * The <input type="file"/> value cannot be passed to the next screen because
- * the browser doesn't allow this for security reasons.
+ * The <input type="file"/> value cannot be passed to the next
+ * screen because the browser doesn't allow this for security
+ * reasons.
*/
deleteParameter("file");
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UsecaseException(e);
} finally {
if (invoker != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org