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

Merged V2.0 to HEAD

Browse Source 
5146: AR-1122
   5148: AR-1116
   5149: RM-5
   5152: AR-1167
   5153: WCM-324
   5154: WCM-325, WCM-301, WCM-258, WCM-25, WCM-320
   5156: WCM-338
   5158: AR-1164
   5169: AR-1216
   5177: WCM-328


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-03-07 12:01:58 +00:00
parent 0671335628
commit 52a3fa1ed1
19 changed files with 877 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
View File

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.util.TempFileProvider;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.FileUploadBean;
@@ -127,7 +128,8 @@ public class UploadFileServlet extends BaseServlet
if (logger.isDebugEnabled())
{
logger.debug("Temp file: " + tempFile.getAbsolutePath() +
" created from upload filename: " + filename);
" size " + tempFile.length() +
" bytes created from upload filename: " + filename);
}
}
}
@@ -152,7 +154,8 @@ public class UploadFileServlet extends BaseServlet
{
logger.debug("Sending back javascript response " + returnPage);
}
response.setContentType(MimetypeMap.MIMETYPE_HTML);
response.setCharacterEncoding("utf-8");
final PrintWriter out = response.getWriter();
out.println("<html><body><script type=\"text/javascript\">");
out.println(returnPage);
@@ -164,7 +167,7 @@ public class UploadFileServlet extends BaseServlet
// finally redirect
if (logger.isDebugEnabled())
{
logger.debug("Upload servicing complete, redirecting to: " + returnPage);
logger.debug("redirecting to: " + returnPage);
}
response.sendRedirect(returnPage);
@@ -173,7 +176,12 @@ public class UploadFileServlet extends BaseServlet
catch (Throwable error)
{
Application.handleServletError(getServletContext(), (HttpServletRequest)request,
(HttpServletResponse)response, error, logger, returnPage);
(HttpServletResponse)response, error, logger, returnPage);
}
if (logger.isDebugEnabled())
{
logger.debug("upload complete");
}
}
}

17
source/java/org/alfresco/web/bean/wcm/AVMEditBean.java
View File

@@ -13,14 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.alfresco.web.bean.wcm;
@@ -59,6 +52,7 @@ import org.alfresco.web.forms.Form;
import org.alfresco.web.forms.FormInstanceData;
import org.alfresco.web.forms.FormInstanceDataImpl;
import org.alfresco.web.forms.FormProcessor;
import org.alfresco.web.forms.RenderingEngineTemplate;
import org.alfresco.web.forms.Rendition;
import org.alfresco.web.forms.RenditionImpl;
import org.alfresco.web.forms.XMLUtil;
@@ -597,16 +591,15 @@ public class AVMEditBean
if (LOGGER.isDebugEnabled())
LOGGER.debug("regenerating renditions of " + fid);
for (Rendition rendition : fid.getRenditions())
for (RenderingEngineTemplate ret : this.getForm().getRenderingEngineTemplates())
{
try
{
rendition.regenerate(fid);
ret.render(fid);
}
catch (Exception e)
{
Utils.addErrorMessage("error regenerating " + rendition.getName() +
" using " + rendition.getRenderingEngineTemplate().getName() +
Utils.addErrorMessage("error regenerating rendition using " + ret.getName() +
": " + e.getMessage(),
e);
}

32
source/java/org/alfresco/web/forms/XMLUtil.java
View File

@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -166,6 +167,37 @@ public class XMLUtil
return XMLUtil.documentBuilder;
}
/**
* FOR DIAGNOSTIC PURPOSES ONLY - incomplete<br/>
* Builds a path to the node relative to the to node provided.
* @param from the node from which to build the xpath
* @param to an ancestor of <tt>from</tt> which will be the root of the path
* @return an xpath to <tt>to</tt> rooted at <tt>from</tt>.
*/
public static String buildXPath(final Element from, final Element to)
{
String result = "";
Node tmp = from;
do
{
Node tmp2 = tmp;
int position = 1;
while (tmp2.getPreviousSibling() != null)
{
if (tmp2.getNodeName().equals(tmp.getNodeName()))
{
position++;
}
tmp2 = tmp2.getPreviousSibling();
}
String part = tmp.getNodeName() + "[" + position + "]";
result = result == null ? "/" + part : "/" + part + result;
tmp = tmp.getParentNode();
}
while (tmp != to.getParentNode() && tmp != null);
return result;
}
public static DocumentBuilder getDocumentBuilder(final boolean namespaceAware,
final boolean validating)
{

178
source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
View File

@@ -93,14 +93,15 @@ public class Schema2XForms
private final Map<String, Long> counter = new HashMap<String, Long>();
private String targetNamespace;
// typeTree
// each entry is keyed by the type name
// value is an ArrayList that contains the XSTypeDefinition's which
// are compatible with the specific type. Compatible means that
// can be used as a substituted type using xsi:type
// In order for it to be compatible, it cannot be abstract, and
// it must be derived by extension.
// The ArrayList does not contain its own type + has the other types only once
/**
* each entry is keyed by the type name
* value is an ArrayList that contains the XSTypeDefinition's which
* are compatible with the specific type. Compatible means that
* can be used as a substituted type using xsi:type
* In order for it to be compatible, it cannot be abstract, and
* it must be derived by extension.
* The ArrayList does not contain its own type + has the other types only once
*/
private TreeMap<String, TreeSet<XSTypeDefinition>> typeTree;
/**
@@ -159,6 +160,7 @@ public class Schema2XForms
//check if target namespace
final StringList schemaNamespaces = schema.getNamespaces();
final HashMap<String, String> schemaNamespacesMap = new HashMap<String, String>();
if (schemaNamespaces.getLength() != 0)
{
// will return null if no target namespace was specified
@@ -172,12 +174,16 @@ public class Schema2XForms
continue;
}
final String prefix = schemaDocument.lookupPrefix(schemaNamespaces.item(i));
LOGGER.debug("adding namespace " + schemaNamespaces.item(i) +
" with prefix " + prefix +
" to xform and default instance element");
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("adding namespace " + schemaNamespaces.item(i) +
" with prefix " + prefix +
" to xform and default instance element");
}
this.addNamespace(xformsDocument.getDocumentElement(),
prefix,
schemaNamespaces.item(i));
schemaNamespacesMap.put(prefix, schemaNamespaces.item(i));
}
}
@@ -273,7 +279,8 @@ public class Schema2XForms
if (importedInstanceDocumentElement != null)
{
this.insertPrototypeNodes(importedInstanceDocumentElement,
defaultInstanceDocumentElement);
defaultInstanceDocumentElement,
schemaNamespacesMap);
}
this.createSubmitElements(xformsDocument, modelSection, rootGroup);
@@ -296,8 +303,18 @@ public class Schema2XForms
this.counter.clear();
}
/**
* Inserts prototype nodes into the provided instance document by aggregating insertion
* points from the generated prototype instance docment.
*
* @param instanceDocumentElement the user provided instance document
* @param prototypeInstanceElement the generated prototype instance document
* @param schemaNamespaces the namespaces used by the instance document needed for
* initializing the xpath context.
*/
private void insertPrototypeNodes(final Element instanceDocumentElement,
final Element prototypeDocumentElement)
final Element prototypeDocumentElement,
final HashMap<String, String> schemaNamespaces)
{
final JXPathContext prototypeContext =
JXPathContext.newContext(prototypeDocumentElement);
@@ -307,15 +324,20 @@ public class Schema2XForms
JXPathContext.newContext(instanceDocumentElement);
instanceContext.registerNamespace(NamespaceService.ALFRESCO_PREFIX,
NamespaceService.ALFRESCO_URI);
for (final String prefix : schemaNamespaces.keySet())
{
prototypeContext.registerNamespace(prefix, schemaNamespaces.get(prefix));
instanceContext.registerNamespace(prefix, schemaNamespaces.get(prefix));
}
class PrototypeInsertionData
{
final Node prototype;
final List nodes;
final List<Node> nodes;
final boolean append;
PrototypeInsertionData(final Node prototype,
final List nodes,
final List<Node> nodes,
final boolean append)
{
this.prototype = prototype;
@@ -323,55 +345,141 @@ public class Schema2XForms
this.append = append;
}
};
final List<PrototypeInsertionData> prototypesToInsert =
new LinkedList<PrototypeInsertionData>();
final HashMap<String, PrototypeInsertionData> prototypesToInsert =
new HashMap<String, PrototypeInsertionData>();
// find all prototype nodes
final Iterator it =
prototypeContext.iteratePointers("//*[@" + NamespaceService.ALFRESCO_PREFIX +
":prototype='true']");
":prototype='true'][ancestor::*[not(@" + NamespaceService.ALFRESCO_PREFIX +
":prototype)]]");
// find all relevant insertion points within the instance document
while (it.hasNext())
{
final Pointer p = (Pointer)it.next();
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("evaluating prototype node " + p.asPath());
}
String path = p.asPath().replaceAll("\\[\\d+\\]", "") + "[last()]";
LOGGER.debug("evaluating " + path + " against instance document");
List l = instanceContext.selectNodes(path);
if (prototypesToInsert.containsKey(path))
{
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("already checked path " + path + " - ignoring.");
}
continue;
}
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("evaluating " + path + " against instance document");
}
List<Node> l = (List<Node>)instanceContext.selectNodes(path);
if (l.size() != 0)
{
prototypesToInsert.add(new PrototypeInsertionData((Node)p.getNode(),
l,
false));
// this is a 1 to n repeat - add a prototype node to the list of repeat instances
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("path " + path + " evaluated to " + l.size() + " nodes");
}
prototypesToInsert.put(path, new PrototypeInsertionData((Node)p.getNode(),
l,
false));
}
else
if (path.lastIndexOf("/") != 0)
{
int index = path.lastIndexOf('/');
path = index == 0 ? "/" : path.substring(0, index);
l = instanceContext.selectNodes(path);
prototypesToInsert.add(new PrototypeInsertionData((Node)p.getNode(),
l,
true));
// this could be a 0 to n repeat - check if there are any relevant parent
// insertion points
path = path.replaceAll("\\/([^/]+)\\[last\\(\\)\\]$", "[not(child::$1)]");
l = (List<Node>)instanceContext.selectNodes(path);
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("path " + path + " evaluated to " + l.size() + " nodes");
}
prototypesToInsert.put(path, new PrototypeInsertionData((Node)p.getNode(),
l,
true));
}
else
{
// this could be a repeat at the root of the document
path = path.replaceAll("\\[last\\(\\)\\]$", "");
l = (List<Node>)instanceContext.selectNodes(path);
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("path " + path + " evaluated to " + l.size() + " nodes");
}
if (l.size() == 0)
{
l.add(instanceDocumentElement);
prototypesToInsert.put(path, new PrototypeInsertionData((Node)p.getNode(),
l,
true));
}
}
}
for (PrototypeInsertionData data : prototypesToInsert)
// apply prototype nodes to all discovered insertion points
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("adding prototype for " + data.prototype.getNodeName() +
" to " + data.nodes.size() + " nodes");
for (Object o : data.nodes)
LOGGER.debug("instance dcoument before mutation " +
XMLUtil.toString(instanceDocumentElement, true));
}
for (Map.Entry<String, PrototypeInsertionData> me : prototypesToInsert.entrySet())
{
final PrototypeInsertionData data = me.getValue();
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("adding prototype for " + data.prototype.getNodeName() +
" from path " + me.getKey() +
" to " + data.nodes.size() + " nodes");
}
for (final Node n : data.nodes)
{
final Node n = (Node)o;
if (data.append)
{
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("appending " + data.prototype.getNodeName() +
" to " + XMLUtil.buildXPath((Element)n, instanceDocumentElement));
}
n.appendChild(data.prototype.cloneNode(true));
}
else if (n.getNextSibling() != null)
{
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("inserting " + data.prototype.getNodeName() +
" into " + XMLUtil.buildXPath((Element)n.getParentNode(),
instanceDocumentElement) +
" before " + XMLUtil.buildXPath((Element)n.getNextSibling(),
instanceDocumentElement));
}
n.getParentNode().insertBefore(data.prototype.cloneNode(true),
n.getNextSibling());
}
else
{
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("appending " + data.prototype.getNodeName() +
" to " + XMLUtil.buildXPath((Element)n.getParentNode(),
instanceDocumentElement));
}
n.getParentNode().appendChild(data.prototype.cloneNode(true));
}
}
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("instance dcoument after mutation " +
XMLUtil.toString(instanceDocumentElement, true));
}
}
}

33
source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
View File

@@ -13,16 +13,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" */
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.alfresco.web.forms.xforms;
import java.io.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ResourceBundle;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
@@ -76,7 +73,8 @@ public class XFormsProcessor
"go_up",
"cancel",
"upload",
"path"
"path",
"eg"
};
public XFormsProcessor()
@@ -154,6 +152,25 @@ public class XFormsProcessor
js.append("alfresco_xforms_constants.FORM_INSTANCE_DATA_NAME = '").
append(session.getFormInstanceDataName()).
append("';\n");
SimpleDateFormat sdf = (SimpleDateFormat)
SimpleDateFormat.getDateInstance(DateFormat.SHORT,
Application.getLanguage(fc));
js.append("alfresco_xforms_constants.DATE_FORMAT = '").
append(sdf.toLocalizedPattern()).
append("';\n");
sdf = (SimpleDateFormat)
SimpleDateFormat.getTimeInstance(DateFormat.SHORT,
Application.getLanguage(fc));
js.append("alfresco_xforms_constants.TIME_FORMAT = '").
append(sdf.toLocalizedPattern()).
append("';\n");
sdf = (SimpleDateFormat)
SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT,
DateFormat.SHORT,
Application.getLanguage(fc));
js.append("alfresco_xforms_constants.DATE_TIME_FORMAT = '").
append(sdf.toLocalizedPattern()).
append("';\n");
for (String[] ns : JS_NAMESPACES)
{
js.append("alfresco_xforms_constants.").

7
source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.web.ui.repo.component.property;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -77,7 +78,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
// and place them in a map keyed by the noderef of the child node
if (this.originalAssocs == null)
{
this.originalAssocs = new HashMap<String, Object>();
this.originalAssocs = new LinkedHashMap<String, Object>();
List assocs = (List)node.getAssociations().get(this.associationName);
if (assocs != null)
@@ -98,7 +99,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
if (added == null)
{
// if there aren't any added associations for 'associationName' create a map and add it
added = new HashMap<String, Object>();
added = new LinkedHashMap<String, Object>();
node.getAddedAssociations().put(this.associationName, (Map)added);
}
@@ -107,7 +108,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
if (removed == null)
{
// if there aren't any added associations for 'associationName' create a map and add it
removed = new HashMap<String, Object>();
removed = new LinkedHashMap<String, Object>();
node.getRemovedAssociations().put(this.associationName, (Map)removed);
}
}

7
source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.web.ui.repo.component.property;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -77,7 +78,7 @@ public class UIChildAssociationEditor extends BaseAssociationEditor
// and place them in a map keyed by the noderef of the child node
if (this.originalAssocs == null)
{
this.originalAssocs = new HashMap<String, Object>();
this.originalAssocs = new LinkedHashMap<String, Object>();
List assocs = (List)node.getChildAssociations().get(this.associationName);
if (assocs != null)
@@ -98,7 +99,7 @@ public class UIChildAssociationEditor extends BaseAssociationEditor
if (added == null)
{
// if there aren't any added associations for 'associationName' create a map and add it
added = new HashMap<String, Object>();
added = new LinkedHashMap<String, Object>();
node.getAddedChildAssociations().put(this.associationName, (Map)added);
}
@@ -107,7 +108,7 @@ public class UIChildAssociationEditor extends BaseAssociationEditor
if (removed == null)
{
// if there aren't any added associations for 'associationName' create a map and add it
removed = new HashMap<String, Object>();
removed = new LinkedHashMap<String, Object>();
node.getRemovedChildAssociations().put(this.associationName, (Map)removed);
}
}