mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)
There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
root\projects\repository\config\alfresco\public-services-context.xml
Reverted:
root\projects\web-client\source\web\images\icons\ajax_anim.gif
Reverted or Resolved (License text conflicts):
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
- why the change in method naming convention?
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java
Modified:
root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -26,6 +26,8 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.Serializable;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -82,6 +84,18 @@ public class RenderingEngineTemplateImpl
|
||||
{
|
||||
private static final Log LOGGER = LogFactory.getLog(RenderingEngineTemplateImpl.class);
|
||||
|
||||
private static final DynamicNamespacePrefixResolver namespacePrefixResolver =
|
||||
new DynamicNamespacePrefixResolver();
|
||||
static
|
||||
{
|
||||
RenderingEngineTemplateImpl.namespacePrefixResolver.registerNamespace(NamespaceService.ALFRESCO_PREFIX,
|
||||
NamespaceService.ALFRESCO_URI);
|
||||
}
|
||||
|
||||
static final QName PROP_RESOURCE_RESOLVER = QName.createQName(NamespaceService.ALFRESCO_PREFIX,
|
||||
"resource_resolver",
|
||||
namespacePrefixResolver);
|
||||
|
||||
private final NodeRef nodeRef;
|
||||
private final NodeRef renditionPropertiesNodeRef;
|
||||
|
||||
@@ -324,7 +338,7 @@ public class RenderingEngineTemplateImpl
|
||||
avmService.setNodeProperties(rendition.getPath(), props);
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Builds the model to pass to the rendering engine.
|
||||
*/
|
||||
protected Map<QName, Object> buildModel(final FormInstanceData formInstanceData,
|
||||
@@ -332,23 +346,60 @@ public class RenderingEngineTemplateImpl
|
||||
throws IOException,
|
||||
SAXException
|
||||
{
|
||||
final DynamicNamespacePrefixResolver namespacePrefixResolver =
|
||||
new DynamicNamespacePrefixResolver();
|
||||
namespacePrefixResolver.registerNamespace(NamespaceService.ALFRESCO_PREFIX,
|
||||
NamespaceService.ALFRESCO_URI);
|
||||
|
||||
final String formInstanceDataAvmPath = formInstanceData.getPath();
|
||||
final String renditionAvmPath = rendition.getPath();
|
||||
final String parentPath = AVMNodeConverter.SplitBase(formInstanceDataAvmPath)[0];
|
||||
final String sandboxUrl = AVMConstants.buildStoreUrl(formInstanceDataAvmPath);
|
||||
final String webappUrl = AVMConstants.buildWebappUrl(formInstanceDataAvmPath);
|
||||
final HashMap<QName, Object> model = new HashMap<QName, Object>();
|
||||
// add simple scalar parameters
|
||||
model.put(QName.createQName(NamespaceService.ALFRESCO_PREFIX,
|
||||
"avm_sandbox_url",
|
||||
namespacePrefixResolver),
|
||||
sandboxUrl);
|
||||
model.put(XSLTRenderingEngine.PROP_URI_RESOLVER_BASE_URI,
|
||||
sandboxUrl);
|
||||
model.put(RenderingEngineTemplateImpl.PROP_RESOURCE_RESOLVER,
|
||||
new RenderingEngine.TemplateResourceResolver()
|
||||
{
|
||||
public InputStream resolve(final String name)
|
||||
{
|
||||
final NodeService nodeService =
|
||||
RenderingEngineTemplateImpl.this.getServiceRegistry().getNodeService();
|
||||
final NodeRef parentNodeRef =
|
||||
nodeService.getPrimaryParent(RenderingEngineTemplateImpl.this.getNodeRef()).getParentRef();
|
||||
LOGGER.debug("request to resolve resource " + name +
|
||||
" webapp url is " + webappUrl +
|
||||
" and data dictionary workspace is " + parentNodeRef);
|
||||
final NodeRef result = nodeService.getChildByName(parentNodeRef, ContentModel.ASSOC_CONTAINS, name);
|
||||
if (result != null)
|
||||
{
|
||||
final ContentService contentService =
|
||||
RenderingEngineTemplateImpl.this.getServiceRegistry().getContentService();
|
||||
try
|
||||
{
|
||||
LOGGER.debug("found " + name + " in data dictonary: " + result);
|
||||
return contentService.getReader(result, ContentModel.PROP_CONTENT).getContentInputStream();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.debug(e);
|
||||
}
|
||||
}
|
||||
|
||||
URI uri = null;
|
||||
try
|
||||
{
|
||||
uri = new URI(webappUrl + (name.charAt(0) == '/' ? name : '/' + name));
|
||||
if (LOGGER.isDebugEnabled())
|
||||
LOGGER.debug("loading " + uri);
|
||||
return uri.toURL().openStream();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.debug(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
});
|
||||
model.put(QName.createQName(NamespaceService.ALFRESCO_PREFIX,
|
||||
"form_instance_data_file_name",
|
||||
namespacePrefixResolver),
|
||||
|
||||
Reference in New Issue
Block a user