diff --git a/source/java/org/alfresco/web/templating/OutputUtil.java b/source/java/org/alfresco/web/templating/OutputUtil.java index ee9bd854a1..ea7896286c 100644 --- a/source/java/org/alfresco/web/templating/OutputUtil.java +++ b/source/java/org/alfresco/web/templating/OutputUtil.java @@ -171,7 +171,7 @@ public class OutputUtil LOGGER.debug("generated " + fileName + " using " + tom); AVMService avmService = AVMContext.fgInstance.getAVMService(); - String parentPath = "repo-1:/repo-1/alice/appBase/avm_webapps/my_webapp"; + String parentPath = "repo-1:/repo-1/alice/appBase/avm_webapps/ROOT/home-insurance"; try { out = new OutputStreamWriter(avmService.createFile(parentPath, generatedFileName)); diff --git a/source/java/org/alfresco/web/templating/xforms/XFormsInputMethod.java b/source/java/org/alfresco/web/templating/xforms/XFormsInputMethod.java index 41ca4f0916..7d9f4c9c32 100644 --- a/source/java/org/alfresco/web/templating/xforms/XFormsInputMethod.java +++ b/source/java/org/alfresco/web/templating/xforms/XFormsInputMethod.java @@ -67,11 +67,11 @@ public class XFormsInputMethod final Document result = ts.newDocument(); final Element div = result.createElement("div"); div.setAttribute("id", "alf-ui"); - div.setAttribute("style", "width: 100%; border: solid 1px orange;"); + div.setAttribute("style", "width: 100%; border: solid 0px orange;"); result.appendChild(div); Element e = result.createElement("script"); - e.appendChild(result.createTextNode("djConfig = { isDebug: true };\n" + + e.appendChild(result.createTextNode("djConfig = { isDebug: false };\n" + "var WEBAPP_CONTEXT = \"" + cp + "\";\n")); div.appendChild(e); e = result.createElement("script"); diff --git a/source/java/org/alfresco/web/templating/xforms/schemabuilder/BaseSchemaFormBuilder.java b/source/java/org/alfresco/web/templating/xforms/schemabuilder/BaseSchemaFormBuilder.java index b3a5a45dff..6af03783b1 100644 --- a/source/java/org/alfresco/web/templating/xforms/schemabuilder/BaseSchemaFormBuilder.java +++ b/source/java/org/alfresco/web/templating/xforms/schemabuilder/BaseSchemaFormBuilder.java @@ -81,16 +81,22 @@ public class BaseSchemaFormBuilder // if the word is all upper case, then set to lower case and continue if (text.equals(text.toUpperCase())) text = text.toLowerCase(); - String[] s = text.split("/[-_\\ ]/"); + String[] s = text.split("[-_\\ ]"); StringBuffer result = new StringBuffer(); for (int i = 0; i < s.length; i++) { if (i != 0) result.append(' '); - result.append(Character.toUpperCase(s[i].charAt(0)) + - s[i].substring(1, s[i].length() - 1)); + if (s[i].length() > 1) + { + result.append(Character.toUpperCase(s[i].charAt(0)) + + s[i].substring(1, s[i].length())); + } + else + { + result.append(s[i]); + } } - return result.toString(); }