inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALFCOM-2816: Changes for JBoss v5.0.1.GA compatibility

Browse Source 
- All code that resolves classpath resources goes through JBossEnabledResourceLoader with VFS support
- JBossEnabledResourcePatternResolver can handle recursion within VFS directory structures
- Reflection used to avoid runtime dependency on JBoss classes
- resource-ref declared in jboss-web.xml 
- Work around incorrect treatment of env-entry-value tag in web.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-04-28 14:07:52 +00:00
parent f743983dcb
commit e1d365e545
7 changed files with 98 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/filesys/alfresco/DesktopAction.java
View File

@@ -25,18 +25,18 @@
package org.alfresco.filesys.alfresco;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.io.IOException;
import java.net.InetAddress;
import java.net.URL;
import java.net.URLDecoder;
import org.alfresco.config.ConfigElement;
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
import org.alfresco.jlan.server.filesys.pseudo.LocalPseudoFile;
import org.alfresco.jlan.server.filesys.pseudo.PseudoFile;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.util.ResourceFinder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.Resource;
/**
* Desktop Action Class
@@ -409,28 +409,31 @@ public abstract class DesktopAction {
throw new DesktopActionException("Desktop action executable path not specified");
// Check that the application exists on the local filesystem
URL appURL = this.getClass().getClassLoader().getResource(m_path);
if ( appURL == null)
Resource resource = new ResourceFinder().getResource(m_path);
if (!resource.exists())
{
throw new DesktopActionException("Failed to find drag and drop application, " + m_path);
}
// Decode the URL path, it might contain escaped characters
String appURLPath = null;
try
{
appURLPath = URLDecoder.decode( appURL.getFile(), "UTF-8");
}
catch ( UnsupportedEncodingException ex)
{
throw new DesktopActionException("Failed to decode drag/drop path, " + ex.getMessage());
}
// Check that the drag/drop file exists
File appFile = new File(appURLPath);
if ( appFile.exists() == false)
throw new DesktopActionException("Drag and drop application not found, " + appFile);
File appFile;
try
{
appFile = resource.getFile();
if (!appFile.exists())
{
throw new DesktopActionException("Drag and drop application not found, " + appFile);
}
}
catch (IOException e)
{
throw new DesktopActionException("Unable to resolve drag and drop application as a file, "
+ resource.getDescription());
}
// Create the pseudo file for the action