diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XFormsTest.java b/source/java/org/alfresco/web/forms/xforms/Schema2XFormsTest.java index bffaad61a0..31f22eef42 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XFormsTest.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XFormsTest.java @@ -62,7 +62,7 @@ public class Schema2XFormsTest public void testOneStringTestWithEmptyInstanceDocument() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/one-string-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/one-string-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "one-string-test"); this.runXForm(xformsDocument); final JXPathContext xpathContext = JXPathContext.newContext(xformsDocument); @@ -82,7 +82,7 @@ public class Schema2XFormsTest throws Exception { final Document instanceDocument = XMLUtil.parse("test"); - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/one-string-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/one-string-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(instanceDocument, schemaDocument, "one-string-test"); this.runXForm(xformsDocument); final JXPathContext xpathContext = JXPathContext.newContext(xformsDocument); @@ -100,7 +100,7 @@ public class Schema2XFormsTest public void testNumbers() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/number-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/number-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "number-test"); System.err.println("generated xform " + XMLUtil.toString(xformsDocument)); final Element[] repeatedNumbers = Schema2XFormsTest.resolveXFormsControl(xformsDocument, "/number-test/repeated_numbers"); @@ -119,7 +119,7 @@ public class Schema2XFormsTest public void testRepeatConstraintsTest() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/repeat-constraints-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/repeat-constraints-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "repeat-constraints-test"); Schema2XFormsTest.assertRepeatProperties(xformsDocument, "/repeat-constraints-test/one-to-inf", @@ -181,7 +181,7 @@ public class Schema2XFormsTest public void testRootElementWithExtension() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/root-element-with-extension-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/root-element-with-extension-test.xsd"); Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "without-extension-test"); this.runXForm(xformsDocument); assertEquals(3, xformsDocument.getElementsByTagNameNS(NamespaceConstants.XFORMS_NS, "input").getLength()); @@ -200,7 +200,7 @@ public class Schema2XFormsTest public void testSwitch() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/switch-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/switch-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "switch-test"); this.runXForm(xformsDocument); // assertEquals(3, xformsDocument.getElementsByTagNameNS(NamespaceConstants.XFORMS_NS, "input").getLength()); @@ -218,7 +218,7 @@ public class Schema2XFormsTest public void testDerivedType() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/derived-type-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/derived-type-test.xsd"); final Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "derived-type-test"); this.runXForm(xformsDocument); LOGGER.debug("generated xforms " + XMLUtil.toString(xformsDocument)); @@ -338,7 +338,7 @@ public class Schema2XFormsTest public void testRecursive() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/recursive-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/recursive-test.xsd"); Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "non-recursive-test"); this.runXForm(xformsDocument); try @@ -364,7 +364,7 @@ public class Schema2XFormsTest public void testAnnotation() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/annotation-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/annotation-test.xsd"); Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "annotation-test"); this.runXForm(xformsDocument); System.err.println("generated xform " + XMLUtil.toString(xformsDocument)); @@ -399,7 +399,7 @@ public class Schema2XFormsTest public void testConstraint() throws Exception { - final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/automated/constraint-test.xsd"); + final Document schemaDocument = this.loadTestResourceDocument("xforms/unit-tests/constraint-test.xsd"); Document xformsDocument = Schema2XFormsTest.buildXForm(null, schemaDocument, "constraint-test"); final ChibaBean chibaBean = this.runXForm(xformsDocument); final LinkedList events = new LinkedList(); diff --git a/source/test-resources/xforms/customer-tests/berekely-grants-RR_SF424-V1.1.xsd b/source/test-resources/xforms/customer-tests/berekely-grants-RR_SF424-V1.1.xsd deleted file mode 100644 index 571cb9b0d8..0000000000 --- a/source/test-resources/xforms/customer-tests/berekely-grants-RR_SF424-V1.1.xsd +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/customer-tests/eyestreet-footer.xsd b/source/test-resources/xforms/customer-tests/eyestreet-footer.xsd deleted file mode 100644 index 1d8a8a8f9e..0000000000 --- a/source/test-resources/xforms/customer-tests/eyestreet-footer.xsd +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/customer-tests/eyestreet-ist-topic.xsd b/source/test-resources/xforms/customer-tests/eyestreet-ist-topic.xsd deleted file mode 100644 index 48e1f48454..0000000000 --- a/source/test-resources/xforms/customer-tests/eyestreet-ist-topic.xsd +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/customer-tests/forums-shiporder.xsd b/source/test-resources/xforms/customer-tests/forums-shiporder.xsd deleted file mode 100644 index e92073a925..0000000000 --- a/source/test-resources/xforms/customer-tests/forums-shiporder.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/customer-tests/grumpy.burton.1.xsd b/source/test-resources/xforms/customer-tests/grumpy.burton.1.xsd deleted file mode 100644 index 8aa2a5e949..0000000000 --- a/source/test-resources/xforms/customer-tests/grumpy.burton.1.xsd +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/customer-tests/nyronian-1.xsd b/source/test-resources/xforms/customer-tests/nyronian-1.xsd deleted file mode 100644 index de06462c2b..0000000000 --- a/source/test-resources/xforms/customer-tests/nyronian-1.xsd +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/demos/note/note.xml b/source/test-resources/xforms/demos/note/note.xml deleted file mode 100644 index af4e5c3497..0000000000 --- a/source/test-resources/xforms/demos/note/note.xml +++ /dev/null @@ -1,6 +0,0 @@ - - me - you - this is a very important note - foo - diff --git a/source/test-resources/xforms/demos/press-release/company-footer.xsd b/source/test-resources/xforms/demos/press-release/company-footer.xsd deleted file mode 100644 index ad8c8027a4..0000000000 --- a/source/test-resources/xforms/demos/press-release/company-footer.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/source/test-resources/xforms/examples/article/article-details.ftl b/source/test-resources/xforms/examples/article/article-details.ftl new file mode 100644 index 0000000000..c634959bde --- /dev/null +++ b/source/test-resources/xforms/examples/article/article-details.ftl @@ -0,0 +1,151 @@ +<#ftl ns_prefixes={"D":"http://www.alfresco.org/alfresco/article","xsi":"http://www.w3.org/2001/XMLSchema-instance"}> + +
+ +
+ ${article.title} +
+ + + + + +
+ <#list article.page as page> + <#if page.page_title[0]??> +
${page.page_title}
+ + <#if page.page_picture[0]??> + <#if page.page_picture.image["@xsi:nil"] == "false"> + <#if page_index % 2 == 1> +
+ + <#if page.page_picture.caption["@xsi:nil"] == "false"> +
${page.page_picture.caption}
+ +
+ <#else> +
+ + <#if page.page_picture.caption["@xsi:nil"] == "false"> +
${page.page_picture.caption}
+ +
+ + + + ${page.page_body} + +
+
+
Related
+ <#if article.related[0]??> +
+ +
+ +
+ + + diff --git a/source/test-resources/xforms/examples/article/article-feature.ftl b/source/test-resources/xforms/examples/article/article-feature.ftl new file mode 100644 index 0000000000..322da242e9 --- /dev/null +++ b/source/test-resources/xforms/examples/article/article-feature.ftl @@ -0,0 +1,89 @@ +<#ftl ns_prefixes={"D":"http://www.alfresco.org/alfresco/article","xsi":"http://www.w3.org/2001/XMLSchema-instance"}> + +
+ +
+ ${article.title} +
+ + + + + diff --git a/source/test-resources/xforms/examples/article/article-list.xsl b/source/test-resources/xforms/examples/article/article-list.xsl new file mode 100644 index 0000000000..5613760d0f --- /dev/null +++ b/source/test-resources/xforms/examples/article/article-list.xsl @@ -0,0 +1,53 @@ + + + + + + + + + + + + + +
+ + + + /content/article/ + + +
+
+
diff --git a/source/test-resources/xforms/examples/article/article-pdf.xsl b/source/test-resources/xforms/examples/article/article-pdf.xsl new file mode 100644 index 0000000000..0708591e21 --- /dev/null +++ b/source/test-resources/xforms/examples/article/article-pdf.xsl @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + — + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/article/article.xsd b/source/test-resources/xforms/examples/article/article.xsd new file mode 100644 index 0000000000..467fc07f99 --- /dev/null +++ b/source/test-resources/xforms/examples/article/article.xsd @@ -0,0 +1,467 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Alabama + + + + + Alaska + + + + + Arizona + + + + + Arkansas + + + + + California + + + + + Colorado + + + + + Connecticut + + + + + District of Columbia + + + + + Delaware + + + + + Florida + + + + + Georgia + + + + + Hawaii + + + + + Idaho + + + + + Illinois + + + + + Indiana + + + + + Iowa + + + + + Kansas + + + + + Kentucky + + + + + Louisiana + + + + + Maine + + + + + Maryland + + + + + Massachusetts + + + + + Michigan + + + + + Minnesota + + + + + Mississippi + + + + + Missouri + + + + + Montana + + + + + Nebraska + + + + + Nevada + + + + + New Hampshire + + + + + New Jersey + + + + + New Mexico + + + + + New York + + + + + North Carolina + + + + + North Dakota + + + + + Ohio + + + + + Oklahoma + + + + + Oregon + + + + + Pennsylvania + + + + + Rhode Island + + + + + South Carolina + + + + + South Dakota + + + + + Tennessee + + + + + Texas + + + + + Utah + + + + + Vermont + + + + + Virginia + + + + + Washington + + + + + West Virginia + + + + + Wisconsin + + + + + Wyoming + + + + + + + + + + + + default + + + + + + + + + + + + + + + + + + + + The value entered is not a valid zip code. + + + + + + + + + + + + + + + + + + The value entered is not a valid email address. + + + + + + + + + + + + + + + + + + + + + + + + + + + + image_file_picker + + + + + + + + + + + + + + full + + + + + + + + + + + + + + search_restricted_file_picker + + + + + + + + + + + + + + + + + + + + full + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/article/article.xsl b/source/test-resources/xforms/examples/article/article.xsl new file mode 100644 index 0000000000..60e067da27 --- /dev/null +++ b/source/test-resources/xforms/examples/article/article.xsl @@ -0,0 +1,136 @@ + + + + + + + + + + + + <xsl:value-of select="/article:article/article:title" disable-output-escaping="yes"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + — + + +

+ + + +
+

+ +

+
+ + /content/article/ + + +
+ + , + +
+

+ + + + + + + left + + + + +

+
+ + +

+ + + + + left + + + right + + +

+ + + + + +
+
+
+ + +
+
diff --git a/source/test-resources/xforms/examples/article/news-flash-details.ftl b/source/test-resources/xforms/examples/article/news-flash-details.ftl new file mode 100644 index 0000000000..201e4785b4 --- /dev/null +++ b/source/test-resources/xforms/examples/article/news-flash-details.ftl @@ -0,0 +1,44 @@ +<#ftl ns_prefixes={"D":"http://www.alfresco.org/alfresco/article","xsi":"http://www.w3.org/2001/XMLSchema-instance"}> + +
+ +
+ ${news_flash.title} +
+ + + + +
+ + diff --git a/source/test-resources/xforms/examples/article/user-profile-details-pdf.ftl b/source/test-resources/xforms/examples/article/user-profile-details-pdf.ftl new file mode 100644 index 0000000000..0dc121157c --- /dev/null +++ b/source/test-resources/xforms/examples/article/user-profile-details-pdf.ftl @@ -0,0 +1,36 @@ +<#ftl ns_prefixes={"D":"http://www.alfresco.org/alfresco/article","xsi":"http://www.w3.org/2001/XMLSchema-instance","alf":"http://www.alfresco.org"}> + + + + <#if user_profile[0]??> + <#if user_profile.picture[0]??> + + + + + +
+ + +
+ ${user_profile.name.prefix}. ${user_profile.name.first} ${user_profile.name.last} +
+
+ ${user_profile.bio} +
+
+ <#if user_profile.address[0]??> + Address: + <#list user_profile.address.street as street> + ${street}  + +  ${user_profile.address.city}, ${user_profile.address.state} ${user_profile.address.zip} + +
+
+ <#if user_profile.email[0]??> + Email: ${user_profile.email} + +
+
+ diff --git a/source/test-resources/xforms/examples/article/user-profile-details.ftl b/source/test-resources/xforms/examples/article/user-profile-details.ftl new file mode 100644 index 0000000000..9862290087 --- /dev/null +++ b/source/test-resources/xforms/examples/article/user-profile-details.ftl @@ -0,0 +1,50 @@ +<#ftl ns_prefixes={"D":"http://www.alfresco.org/alfresco/article","xsi":"http://www.w3.org/2001/XMLSchema-instance"}> + + + + diff --git a/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.desc.xml b/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.desc.xml new file mode 100644 index 0000000000..8781e2ddb9 --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.desc.xml @@ -0,0 +1,8 @@ + + WCM Schema for Category Selection + Generate part of schema for category selection + + extension + user + required + \ No newline at end of file diff --git a/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.html.ftl b/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.html.ftl new file mode 100644 index 0000000000..f24daa986b --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.html.ftl @@ -0,0 +1,23 @@ + + + + + + + Press Release + + + + + + + Whitepaper + + + + + + + diff --git a/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.js b/source/test-resources/xforms/examples/article/webscripts/CategorySelection.get.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source/test-resources/xforms/examples/article/webscripts/ContentList.get.desc.xml b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.desc.xml new file mode 100644 index 0000000000..f5c18cf607 --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.desc.xml @@ -0,0 +1,8 @@ + + WCM Schema for Content Selection + Generate part of schema for content selection + + extension + user + required + \ No newline at end of file diff --git a/source/test-resources/xforms/examples/article/webscripts/ContentList.get.html.ftl b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.html.ftl new file mode 100644 index 0000000000..e998f6d0ea --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.html.ftl @@ -0,0 +1,25 @@ + +<#if results??> + + + + <#list results as result> + <#if ! result.hasAspect("{http://www.alfresco.org/model/wcmappmodel/1.0}rendition")> + + + + ${result.name?substring(0,result.name?index_of(".xml"))} + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/article/webscripts/ContentList.get.js b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.js new file mode 100644 index 0000000000..743e886dff --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.js @@ -0,0 +1,70 @@ +var contentList = null; + +if (args["storeid"] == null) { + + logger.log("ERROR: 'store' argument not specified."); + +} else { + + // Get the store id + var storeId = args["storeid"]; + + var store = avm.lookupStore(storeId); + + if ( store != null ) { + + // Get the form name + var formName = args["form"]; + + if ( formName != null ) { + + + var method = (args.method == null) ? "lucene" : args.method; + + if ( method == "lucene" ) { + + // Run the lucene query + var results = store.luceneSearch('@\\{http\\://www.alfresco.org/model/wcmappmodel/1.0\\}parentformname:"'+formName+'"'); + + contentList = results; + + } else { + + var path = (args.path == null) ? "/ROOT" : args.path; + + var storeRootNode = avm.lookupStoreRoot(storeId); + + // try xpath??? + + var results = avm.lookupNode(storeRootNode.path + path); + + var contentList = new Array(); + + if ( results.children != null ) { + + for ( var i = 0 ; i < results.children.length ; i ++ ) { + + var item = results.children[i]; + + if ( item.properties["{http://www.alfresco.org/model/wcmappmodel/1.0}parentformname"] == formName ) { + + contentList.push(item); + + } + + } + + } + + } + + } + + } else { + + + } + +} + +model.results= contentList; \ No newline at end of file diff --git a/source/test-resources/xforms/examples/article/webscripts/ContentList.get.xml.ftl b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.xml.ftl new file mode 100644 index 0000000000..e998f6d0ea --- /dev/null +++ b/source/test-resources/xforms/examples/article/webscripts/ContentList.get.xml.ftl @@ -0,0 +1,25 @@ + +<#if results??> + + + + <#list results as result> + <#if ! result.hasAspect("{http://www.alfresco.org/model/wcmappmodel/1.0}rendition")> + + + + ${result.name?substring(0,result.name?index_of(".xml"))} + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/getting-started-sample/Product-Evaluation-Guide.pdf b/source/test-resources/xforms/examples/getting-started-sample/Product-Evaluation-Guide.pdf new file mode 100644 index 0000000000..60c46ac589 Binary files /dev/null and b/source/test-resources/xforms/examples/getting-started-sample/Product-Evaluation-Guide.pdf differ diff --git a/source/test-resources/xforms/examples/getting-started-sample/alfresco-sample-website.war b/source/test-resources/xforms/examples/getting-started-sample/alfresco-sample-website.war new file mode 100644 index 0000000000..416c8560cb Binary files /dev/null and b/source/test-resources/xforms/examples/getting-started-sample/alfresco-sample-website.war differ diff --git a/source/test-resources/xforms/examples/getting-started-sample/company-footer.xsd b/source/test-resources/xforms/examples/getting-started-sample/company-footer.xsd new file mode 100644 index 0000000000..cadbaa709c --- /dev/null +++ b/source/test-resources/xforms/examples/getting-started-sample/company-footer.xsd @@ -0,0 +1,41 @@ + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl b/source/test-resources/xforms/examples/getting-started-sample/press-release-plain-text.ftl similarity index 100% rename from source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl rename to source/test-resources/xforms/examples/getting-started-sample/press-release-plain-text.ftl diff --git a/source/test-resources/xforms/demos/press-release/press-release.xml b/source/test-resources/xforms/examples/getting-started-sample/press-release.xml similarity index 100% rename from source/test-resources/xforms/demos/press-release/press-release.xml rename to source/test-resources/xforms/examples/getting-started-sample/press-release.xml diff --git a/source/test-resources/xforms/demos/press-release/press-release.xsd b/source/test-resources/xforms/examples/getting-started-sample/press-release.xsd similarity index 61% rename from source/test-resources/xforms/demos/press-release/press-release.xsd rename to source/test-resources/xforms/examples/getting-started-sample/press-release.xsd index e4b6af7e33..fb3fb74d07 100644 --- a/source/test-resources/xforms/demos/press-release/press-release.xsd +++ b/source/test-resources/xforms/examples/getting-started-sample/press-release.xsd @@ -1,19 +1,27 @@ diff --git a/source/test-resources/xforms/demos/press-release/press-release.xsl b/source/test-resources/xforms/examples/getting-started-sample/press-release.xsl similarity index 81% rename from source/test-resources/xforms/demos/press-release/press-release.xsl rename to source/test-resources/xforms/examples/getting-started-sample/press-release.xsl index b836e5c8b5..9220246d4f 100644 --- a/source/test-resources/xforms/demos/press-release/press-release.xsl +++ b/source/test-resources/xforms/examples/getting-started-sample/press-release.xsl @@ -1,19 +1,27 @@ +
+[#list avm.stores as store] + ${store.name}
+[/#list] +
+ + + + diff --git a/source/test-resources/xforms/examples/press-release/press-release-full.xslt b/source/test-resources/xforms/examples/press-release/press-release-full.xslt new file mode 100644 index 0000000000..10f7e38a34 --- /dev/null +++ b/source/test-resources/xforms/examples/press-release/press-release-full.xslt @@ -0,0 +1,81 @@ + + + + + + + + + + + + + <xsl:value-of select="/pr:PressRelease/pr:Title" disable-output-escaping="yes" /> + + + + + + + + + + + + + + + , + + + + + + + +

+

+ + + + + + + + + +
+ +
diff --git a/source/test-resources/xforms/examples/press-release/press-release-summary.xslt b/source/test-resources/xforms/examples/press-release/press-release-summary.xslt new file mode 100644 index 0000000000..da5f4d51ab --- /dev/null +++ b/source/test-resources/xforms/examples/press-release/press-release-summary.xslt @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + .html + + + + +

+
+ + +
+ +
diff --git a/source/test-resources/xforms/examples/press-release/press-release.xsd b/source/test-resources/xforms/examples/press-release/press-release.xsd new file mode 100644 index 0000000000..5439008d20 --- /dev/null +++ b/source/test-resources/xforms/examples/press-release/press-release.xsd @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/product/product.xsd b/source/test-resources/xforms/examples/product/product.xsd new file mode 100644 index 0000000000..da8b418e18 --- /dev/null +++ b/source/test-resources/xforms/examples/product/product.xsd @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/product/product.xslt b/source/test-resources/xforms/examples/product/product.xslt new file mode 100644 index 0000000000..b0d9867e6d --- /dev/null +++ b/source/test-resources/xforms/examples/product/product.xslt @@ -0,0 +1,108 @@ + + + + + + + + + + + + + <xsl:value-of select="/pr:Product/pr:Title" disable-output-escaping="yes" /> + (<xsl:value-of select="/pr:Product/pr:SKU" disable-output-escaping="yes" />) + + + + + + + + + + + + + + + , + + + + + + + +

+ + () +

+ + + + + + + + + + + + + + + + + + +

+ + +

Other product images:

+ + + + + + +
+
+
+ + +
+ +
diff --git a/source/test-resources/xforms/demos/record/record.xsd b/source/test-resources/xforms/examples/record/record.xsd similarity index 100% rename from source/test-resources/xforms/demos/record/record.xsd rename to source/test-resources/xforms/examples/record/record.xsd diff --git a/source/test-resources/xforms/demos/record/record.xsl b/source/test-resources/xforms/examples/record/record.xsl similarity index 100% rename from source/test-resources/xforms/demos/record/record.xsl rename to source/test-resources/xforms/examples/record/record.xsl diff --git a/source/test-resources/xforms/demos/user-registration/user-registration.xsd b/source/test-resources/xforms/examples/user-registration/user-registration.xsd similarity index 100% rename from source/test-resources/xforms/demos/user-registration/user-registration.xsd rename to source/test-resources/xforms/examples/user-registration/user-registration.xsd diff --git a/source/test-resources/xforms/examples/wcm-form-samples-forms.acp b/source/test-resources/xforms/examples/wcm-form-samples-forms.acp new file mode 100644 index 0000000000..75234ea288 Binary files /dev/null and b/source/test-resources/xforms/examples/wcm-form-samples-forms.acp differ diff --git a/source/test-resources/xforms/examples/wcm-form-samples.amp b/source/test-resources/xforms/examples/wcm-form-samples.amp new file mode 100644 index 0000000000..8babd601f6 Binary files /dev/null and b/source/test-resources/xforms/examples/wcm-form-samples.amp differ diff --git a/source/test-resources/xforms/examples/webscript-import/pmonks-webscript-format-map-context.xml b/source/test-resources/xforms/examples/webscript-import/pmonks-webscript-format-map-context.xml new file mode 100644 index 0000000000..4e2db26b61 --- /dev/null +++ b/source/test-resources/xforms/examples/webscript-import/pmonks-webscript-format-map-context.xml @@ -0,0 +1,15 @@ + + + + + + + + + + text/xml + + + + + diff --git a/source/test-resources/xforms/examples/webscript-import/webscript-import-example.xsd b/source/test-resources/xforms/examples/webscript-import/webscript-import-example.xsd new file mode 100644 index 0000000000..41808c8d47 --- /dev/null +++ b/source/test-resources/xforms/examples/webscript-import/webscript-import-example.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.desc.xml b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.desc.xml new file mode 100755 index 0000000000..9bd9e85368 --- /dev/null +++ b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.desc.xml @@ -0,0 +1,7 @@ + + Web Form Import Example + Example for testing import of a Web Script from a Web Form + /pmonks/webformimport?storeid={storeid} + any + user + diff --git a/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.js b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.js new file mode 100755 index 0000000000..49f4d75e9c --- /dev/null +++ b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.js @@ -0,0 +1,14 @@ +// Parse arguments +var storeid = args.storeid; + +// Validate arguments +if (storeid == undefined || storeid == "") +{ + status.code = 400; + status.message = "Mandatory query string parameter 'storeid' was not provided."; + status.redirect = true; +} + +// Generate an id (in a truly terrible way, but it's just an example!) +model.storeid = storeid; +model.idValue = Math.floor(Math.random() * 1000); diff --git a/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.xsd.ftl b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.xsd.ftl new file mode 100755 index 0000000000..b42720211d --- /dev/null +++ b/source/test-resources/xforms/examples/webscript-import/webscripts/webscriptxformimport.get.xsd.ftl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/alfresco-wsf-website.war b/source/test-resources/xforms/examples/wsf-website/alfresco-wsf-website.war new file mode 100644 index 0000000000..a2358e201f Binary files /dev/null and b/source/test-resources/xforms/examples/wsf-website/alfresco-wsf-website.war differ diff --git a/source/test-resources/xforms/examples/wsf-website/article/article-feature.xsl b/source/test-resources/xforms/examples/wsf-website/article/article-feature.xsl new file mode 100644 index 0000000000..b29216e83e --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/article/article-feature.xsl @@ -0,0 +1,90 @@ + + + + + + + + + <%String channel = (String) request.getParameter("channel");%> + + + + <xsl:value-of select="/article:article/article:title" disable-output-escaping="yes"/> + + + + + + + + + + + + + + + + + +
+ + + /views/pages/details.jsp?channel=<%=channel%>&content=/content/article/&title= + + + +
+ + , + +
+

+ + + + + + + left + + + + +

+
+ + +
+
diff --git a/source/test-resources/xforms/examples/wsf-website/article/article-list.xsl b/source/test-resources/xforms/examples/wsf-website/article/article-list.xsl new file mode 100644 index 0000000000..28151ed066 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/article/article-list.xsl @@ -0,0 +1,51 @@ + + + + + + + + + <%String channel = (String) request.getParameter("channel");%> + + + + +
+ + /views/pages/details.jsp?channel=<%=channel%>&content=/content/article/&title= + + +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/article/article-rss.xsl b/source/test-resources/xforms/examples/wsf-website/article/article-rss.xsl new file mode 100644 index 0000000000..6699584e5a --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/article/article-rss.xsl @@ -0,0 +1,43 @@ + + + + + + + + + + <xsl:value-of select="/article:article/article:title" disable-output-escaping="yes"/> + /views/pages/details.jsp?content=/content/article/&title= + + 2000-01-01T12:00:00.000-00:00 + + + diff --git a/source/test-resources/xforms/examples/wsf-website/article/article.xsd b/source/test-resources/xforms/examples/wsf-website/article/article.xsd new file mode 100644 index 0000000000..a3e81bfcb6 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/article/article.xsd @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/article/article.xsl b/source/test-resources/xforms/examples/wsf-website/article/article.xsl new file mode 100644 index 0000000000..80c641717c --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/article/article.xsl @@ -0,0 +1,127 @@ + + + + + + + + + + + + <xsl:value-of select="/article:article/article:title" disable-output-escaping="yes"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + — + + +

+ + + +
+

+ +

+
+ + , + +
+

+ + + + + + + left + + + + +

+
+ + +

+ + + + + left + + + right + + +

+ + + + + +
+
+
+ + +
+
diff --git a/source/test-resources/xforms/examples/wsf-website/motd/motd.xsd b/source/test-resources/xforms/examples/wsf-website/motd/motd.xsd new file mode 100644 index 0000000000..af03818933 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/motd/motd.xsd @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/motd/motd.xsl b/source/test-resources/xforms/examples/wsf-website/motd/motd.xsl new file mode 100644 index 0000000000..f60a066ed1 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/motd/motd.xsl @@ -0,0 +1,42 @@ + + + + + + + + +
+ +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media-list.xsl b/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media-list.xsl new file mode 100644 index 0000000000..66cb26f8b9 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media-list.xsl @@ -0,0 +1,43 @@ + + + + + + + + + + + <xsl:value-of select="/mm:multi-media/mm:title"/> + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media.xsd b/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media.xsd new file mode 100644 index 0000000000..970d9ad077 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/multi-media/multi-media.xsd @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/navigation/navigation-menu.xsl b/source/test-resources/xforms/examples/wsf-website/navigation/navigation-menu.xsl new file mode 100644 index 0000000000..f484b5c887 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/navigation/navigation-menu.xsl @@ -0,0 +1,89 @@ + + + + + + + + \ No newline at end of file diff --git a/source/test-resources/xforms/examples/wsf-website/navigation/navigation-sitemap.xsl b/source/test-resources/xforms/examples/wsf-website/navigation/navigation-sitemap.xsl new file mode 100644 index 0000000000..69d6fd39ad --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/navigation/navigation-sitemap.xsl @@ -0,0 +1,97 @@ + + + + + + + + + + /views/pages/index.jsp + + + + + + + /views/pages/main-channel.jsp?channel=/ + + + + + + + /views/pages/details.jsp?channel=/&content= + + + + + + + + + /views/pages/sub-channel.jsp?channel= + + + + + + + /views/pages/details.jsp?channel=&content= + + + + + + + + + /views/pages/sub-sub-channel.jsp?channel= + + + + + + + /views/pages/details.jsp?channel=&content= + + + + + + + + + + + /views/pages/details.jsp?channel=/&content= + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/navigation/navigation.xsd b/source/test-resources/xforms/examples/wsf-website/navigation/navigation.xsd new file mode 100644 index 0000000000..45b170c289 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/navigation/navigation.xsd @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-feature.xsl b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-feature.xsl new file mode 100644 index 0000000000..7b9376e48a --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-feature.xsl @@ -0,0 +1,59 @@ + + + + + + + + + <%String channel = (String) request.getParameter("channel");%> + + + + + + + + +
+ + /views/pages/details.jsp?channel=<%=channel%>&amp;content=/content/news-flash/&amp;title= + + + + +
+ + +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-list.xsl b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-list.xsl new file mode 100644 index 0000000000..e42f94aa63 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash-list.xsl @@ -0,0 +1,50 @@ + + + + + + + + + <%String channel = (String) request.getParameter("channel");%> + + + + +
+ + /views/pages/details.jsp?channel=<%=channel%>&amp;content=/content/news-flash/&amp;title= + + +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsd b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsd new file mode 100644 index 0000000000..9f14fa7196 --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsd @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsl b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsl new file mode 100644 index 0000000000..e61a87bb1b --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/news-flash/news-flash.xsl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + +
+ + + +
+ +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/potd/potd.xsd b/source/test-resources/xforms/examples/wsf-website/potd/potd.xsd new file mode 100644 index 0000000000..4d144cce0c --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/potd/potd.xsd @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/potd/potd.xsl b/source/test-resources/xforms/examples/wsf-website/potd/potd.xsl new file mode 100644 index 0000000000..d2166ce0cc --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/potd/potd.xsl @@ -0,0 +1,43 @@ + + + + + + + + + + potd_images[] = new Image(); + potd_images[].src =''; + + + diff --git a/source/test-resources/xforms/examples/wsf-website/profile/profile.xsd b/source/test-resources/xforms/examples/wsf-website/profile/profile.xsd new file mode 100644 index 0000000000..cbd28961dc --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/profile/profile.xsd @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + minimal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/examples/wsf-website/profile/profile.xsl b/source/test-resources/xforms/examples/wsf-website/profile/profile.xsl new file mode 100644 index 0000000000..7f8be1a9ce --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/profile/profile.xsl @@ -0,0 +1,91 @@ + + + + + + + + + + + + + +
+ + + + + + + left + + + 75 + + + 75 + + + + + + + + + + . +
+ + +
+
+ +
+
+ +
+
+ + + + + + + + # + addGeocode('',''); + Show Address + +
+
+
diff --git a/source/test-resources/xforms/examples/wsf-website/site-configuration/site-configuration.xsd b/source/test-resources/xforms/examples/wsf-website/site-configuration/site-configuration.xsd new file mode 100644 index 0000000000..15c3f63a7f --- /dev/null +++ b/source/test-resources/xforms/examples/wsf-website/site-configuration/site-configuration.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/bugs/ETHREEOH-1046.xsd b/source/test-resources/xforms/tests/bugs/ETHREEOH-1046.xsd new file mode 100644 index 0000000000..112b7a3ea9 --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETHREEOH-1046.xsd @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/test-resources/xforms/tests/bugs/ETHREEOH-1351.xsd b/source/test-resources/xforms/tests/bugs/ETHREEOH-1351.xsd new file mode 100644 index 0000000000..de007d4da5 --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETHREEOH-1351.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + default + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd b/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd new file mode 100644 index 0000000000..a5f29362ad --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Image path + An image is required to create content + image_file_picker + + + + + + + + + + + + + + + + + + full + + + + + + + + + + + Image path + An image is required to create content + image_file_picker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd new file mode 100644 index 0000000000..fb730b5284 --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + minimal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + minimal + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-868.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-868.xsd new file mode 100644 index 0000000000..e7566e8f0c --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETWOTWO-868.xsd @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + Alabama + + + + + Alaska + + + + + Arizona + + + + + Arkansas + + + + + California + + + + + Colorado + + + + + Connecticut + + + + + District of Columbia + + + + + Delaware + + + + + Florida + + + + + Georgia + + + + + Hawaii + + + + + Idaho + + + + + Illinois + + + + + Indiana + + + + + Iowa + + + + + Kansas + + + + + Kentucky + + + + + Louisiana + + + + + Maine + + + + + Maryland + + + + + Massachusetts + + + + + Michigan + + + + + Minnesota + + + + + Mississippi + + + + + Missouri + + + + + Montana + + + + + Nebraska + + + + + Nevada + + + + + New Hampshire + + + + + New Jersey + + + + + New Mexico + + + + + New York + + + + + North Carolina + + + + + North Dakota + + + + + Ohio + + + + + Oklahoma + + + + + Oregon + + + + + Pennsylvania + + + + + Rhode Island + + + + + South Carolina + + + + + South Dakota + + + + + Tennessee + + + + + Texas + + + + + Utah + + + + + Vermont + + + + + Virginia + + + + + Washington + + + + + West Virginia + + + + + Wisconsin + + + + + Wyoming + + + + + + + + + + + + minimal + + + + + + + + + + + + + + + + + + + + The value entered is not a valid zip code. + + + + + + + + + + + + + + + + + + The value entered is not a valid email address. + + + + + + + + + + + + + + + + + + image_file_picker + + + + + + + + + + + + + + full + + + + + + + + + + + + + + search_restricted_file_picker + + + + + + + + + + + + + + + + + + + + full + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-879.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-879.xsd new file mode 100644 index 0000000000..082909fa0a --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETWOTWO-879.xsd @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd new file mode 100644 index 0000000000..ee6f515caf Binary files /dev/null and b/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd differ diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-950.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-950.xsd new file mode 100644 index 0000000000..7312c9e428 --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/ETWOTWO-950.xsd @@ -0,0 +1,37 @@ + + + + + + + + + + + + Test Item + + + + + + + + + + + + Content Type + full + + + + + + + + \ No newline at end of file diff --git a/source/test-resources/xforms/tests/bugs/datebug.xsd b/source/test-resources/xforms/tests/bugs/datebug.xsd new file mode 100644 index 0000000000..cdca517e95 --- /dev/null +++ b/source/test-resources/xforms/tests/bugs/datebug.xsd @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/rendering-engine/article.xsd b/source/test-resources/xforms/tests/rendering-engine/article.xsd new file mode 100644 index 0000000000..3c30b5b027 --- /dev/null +++ b/source/test-resources/xforms/tests/rendering-engine/article.xsd @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/rendering-engine/article.xslt b/source/test-resources/xforms/tests/rendering-engine/article.xslt new file mode 100644 index 0000000000..a0f79c30f0 --- /dev/null +++ b/source/test-resources/xforms/tests/rendering-engine/article.xslt @@ -0,0 +1,81 @@ + + + + + + + + + + + + + <xsl:value-of select="/ar:Article/ar:Title" disable-output-escaping="yes" /> + + + + + + + + + + + + + + + , + + + + + + + +

+

+ + + + + + + + + +
+ +
diff --git a/source/test-resources/xforms/unit-tests/simple-test/components-test.xsd b/source/test-resources/xforms/tests/rendering-engine/components-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/components-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/components-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/components-test.xsl b/source/test-resources/xforms/tests/rendering-engine/components-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/components-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/components-test.xsl diff --git a/source/test-resources/xforms/unit-tests/simple-test/default-values.xsd b/source/test-resources/xforms/tests/rendering-engine/default-values.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/default-values.xsd rename to source/test-resources/xforms/tests/rendering-engine/default-values.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/default-values.xsl b/source/test-resources/xforms/tests/rendering-engine/default-values.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/default-values.xsl rename to source/test-resources/xforms/tests/rendering-engine/default-values.xsl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl b/source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.ftl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl rename to source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.ftl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsd b/source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.xsd diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl b/source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/form-data-functions-test.xsl diff --git a/source/test-resources/xforms/tests/rendering-engine/html-block-with-attributes.xsd b/source/test-resources/xforms/tests/rendering-engine/html-block-with-attributes.xsd new file mode 100644 index 0000000000..f975d887f3 --- /dev/null +++ b/source/test-resources/xforms/tests/rendering-engine/html-block-with-attributes.xsd @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/rendering-engine/html-block.xsd b/source/test-resources/xforms/tests/rendering-engine/html-block.xsd new file mode 100644 index 0000000000..95845ffa91 --- /dev/null +++ b/source/test-resources/xforms/tests/rendering-engine/html-block.xsd @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/rendering-engine/html-block.xslt b/source/test-resources/xforms/tests/rendering-engine/html-block.xslt new file mode 100644 index 0000000000..c354d7c2bf --- /dev/null +++ b/source/test-resources/xforms/tests/rendering-engine/html-block.xslt @@ -0,0 +1,74 @@ + + + + + + + + + + + + + <xsl:value-of select="/hb:HtmlBlock/hb:Title" disable-output-escaping="yes" /> + + + + + + + + + + + + + + + , + + + + + + + +

+

+ + +
+ +
diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-data-dictionary.ftl b/source/test-resources/xforms/tests/rendering-engine/include-test-data-dictionary.ftl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-data-dictionary.ftl rename to source/test-resources/xforms/tests/rendering-engine/include-test-data-dictionary.ftl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-data-dictionary.xsl b/source/test-resources/xforms/tests/rendering-engine/include-test-data-dictionary.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-data-dictionary.xsl rename to source/test-resources/xforms/tests/rendering-engine/include-test-data-dictionary.xsl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-webapp.ftl b/source/test-resources/xforms/tests/rendering-engine/include-test-webapp.ftl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-webapp.ftl rename to source/test-resources/xforms/tests/rendering-engine/include-test-webapp.ftl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-webapp.xsl b/source/test-resources/xforms/tests/rendering-engine/include-test-webapp.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test-webapp.xsl rename to source/test-resources/xforms/tests/rendering-engine/include-test-webapp.xsl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.ftl b/source/test-resources/xforms/tests/rendering-engine/include-test.ftl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.ftl rename to source/test-resources/xforms/tests/rendering-engine/include-test.ftl diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.xsd b/source/test-resources/xforms/tests/rendering-engine/include-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/include-test.xsd diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.xsl b/source/test-resources/xforms/tests/rendering-engine/include-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/rendering-engine-test/include-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/include-test.xsl diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-components.xsd b/source/test-resources/xforms/tests/rendering-engine/repeat-components.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-components.xsd rename to source/test-resources/xforms/tests/rendering-engine/repeat-components.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-components.xsl b/source/test-resources/xforms/tests/rendering-engine/repeat-components.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-components.xsl rename to source/test-resources/xforms/tests/rendering-engine/repeat-components.xsl diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-simple-test.xsd b/source/test-resources/xforms/tests/rendering-engine/repeat-simple-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-simple-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/repeat-simple-test.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-simple-test.xsl b/source/test-resources/xforms/tests/rendering-engine/repeat-simple-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-simple-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/repeat-simple-test.xsl diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.fo b/source/test-resources/xforms/tests/rendering-engine/simple-test.fo similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/simple-test.fo rename to source/test-resources/xforms/tests/rendering-engine/simple-test.fo diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl b/source/test-resources/xforms/tests/rendering-engine/simple-test.ftl similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/simple-test.ftl rename to source/test-resources/xforms/tests/rendering-engine/simple-test.ftl diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsd b/source/test-resources/xforms/tests/rendering-engine/simple-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/simple-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/simple-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl b/source/test-resources/xforms/tests/rendering-engine/simple-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/simple-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/simple-test.xsl diff --git a/source/test-resources/xforms/unit-tests/simple-test/strings.properties b/source/test-resources/xforms/tests/rendering-engine/strings.properties similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/strings.properties rename to source/test-resources/xforms/tests/rendering-engine/strings.properties diff --git a/source/test-resources/xforms/unit-tests/simple-test/strings_fr.properties b/source/test-resources/xforms/tests/rendering-engine/strings_fr.properties similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/strings_fr.properties rename to source/test-resources/xforms/tests/rendering-engine/strings_fr.properties diff --git a/source/test-resources/xforms/unit-tests/simple-test/textarea-test.xsd b/source/test-resources/xforms/tests/rendering-engine/textarea-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/textarea-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/textarea-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/textarea-test.xsl b/source/test-resources/xforms/tests/rendering-engine/textarea-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/textarea-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/textarea-test.xsl diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/xml-namespaces-test.xsd b/source/test-resources/xforms/tests/rendering-engine/xml-namespaces-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/xml-namespaces-test.xsd rename to source/test-resources/xforms/tests/rendering-engine/xml-namespaces-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/xml-namespaces-test.xsl b/source/test-resources/xforms/tests/rendering-engine/xml-namespaces-test.xsl similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/xml-namespaces-test.xsl rename to source/test-resources/xforms/tests/rendering-engine/xml-namespaces-test.xsl diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/attribute-group-test.xsd b/source/test-resources/xforms/tests/schema/attribute-group-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/attribute-group-test.xsd rename to source/test-resources/xforms/tests/schema/attribute-group-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/attributes-test.xsd b/source/test-resources/xforms/tests/schema/attributes-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/attributes-test.xsd rename to source/test-resources/xforms/tests/schema/attributes-test.xsd diff --git a/source/test-resources/xforms/tests/schema/broken-import-negative-test.xsd b/source/test-resources/xforms/tests/schema/broken-import-negative-test.xsd new file mode 100644 index 0000000000..2a1684cbdd --- /dev/null +++ b/source/test-resources/xforms/tests/schema/broken-import-negative-test.xsd @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/simple-test/datetime-test.xsd b/source/test-resources/xforms/tests/schema/datetime-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/datetime-test.xsd rename to source/test-resources/xforms/tests/schema/datetime-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/readonly-and-default-values-test.xsd b/source/test-resources/xforms/tests/schema/default-values-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/readonly-and-default-values-test.xsd rename to source/test-resources/xforms/tests/schema/default-values-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/element-ref-test.xsd b/source/test-resources/xforms/tests/schema/element-ref-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/element-ref-test.xsd rename to source/test-resources/xforms/tests/schema/element-ref-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/empty-extension-test.xsd b/source/test-resources/xforms/tests/schema/empty-extension-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/empty-extension-test.xsd rename to source/test-resources/xforms/tests/schema/empty-extension-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/group-appearance-test.xsd b/source/test-resources/xforms/tests/schema/group-appearance-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/group-appearance-test.xsd rename to source/test-resources/xforms/tests/schema/group-appearance-test.xsd diff --git a/source/test-resources/xforms/tests/schema/hidden-field-example.xsd b/source/test-resources/xforms/tests/schema/hidden-field-example.xsd new file mode 100644 index 0000000000..f239a75bd6 --- /dev/null +++ b/source/test-resources/xforms/tests/schema/hidden-field-example.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + hidden + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/schema/image.xsd b/source/test-resources/xforms/tests/schema/image.xsd new file mode 100644 index 0000000000..f8955b1214 --- /dev/null +++ b/source/test-resources/xforms/tests/schema/image.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/schema/import-example.xsd b/source/test-resources/xforms/tests/schema/import-example.xsd new file mode 100644 index 0000000000..ad2d3d9871 --- /dev/null +++ b/source/test-resources/xforms/tests/schema/import-example.xsd @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/tests/schema/imported.xsd b/source/test-resources/xforms/tests/schema/imported.xsd new file mode 100644 index 0000000000..d1d252f8ba --- /dev/null +++ b/source/test-resources/xforms/tests/schema/imported.xsd @@ -0,0 +1,38 @@ + + + + + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/simple-test/inheritence-test.xsd b/source/test-resources/xforms/tests/schema/inheritence-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/inheritence-test.xsd rename to source/test-resources/xforms/tests/schema/inheritence-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/integer-test.xsd b/source/test-resources/xforms/tests/schema/integer-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/integer-test.xsd rename to source/test-resources/xforms/tests/schema/integer-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/list-test.xsd b/source/test-resources/xforms/tests/schema/list-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/list-test.xsd rename to source/test-resources/xforms/tests/schema/list-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/multi-form-schema-test.xsd b/source/test-resources/xforms/tests/schema/multi-form-schema-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/multi-form-schema-test.xsd rename to source/test-resources/xforms/tests/schema/multi-form-schema-test.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/multi-namespace-test-other.xsd b/source/test-resources/xforms/tests/schema/multi-namespace-test-other.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/multi-namespace-test-other.xsd rename to source/test-resources/xforms/tests/schema/multi-namespace-test-other.xsd diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/multi-namespace-test.xsd b/source/test-resources/xforms/tests/schema/multi-namespace-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/multi-namespace-test.xsd rename to source/test-resources/xforms/tests/schema/multi-namespace-test.xsd diff --git a/source/test-resources/xforms/tests/schema/multilingual-press-release.xsd b/source/test-resources/xforms/tests/schema/multilingual-press-release.xsd new file mode 100644 index 0000000000..d5a28dfd0f --- /dev/null +++ b/source/test-resources/xforms/tests/schema/multilingual-press-release.xsd @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/no-elements-test.xsd b/source/test-resources/xforms/tests/schema/no-elements-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/no-elements-test.xsd rename to source/test-resources/xforms/tests/schema/no-elements-test.xsd diff --git a/source/test-resources/xforms/unit-tests/simple-test/range-test.xsd b/source/test-resources/xforms/tests/schema/range-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/range-test.xsd rename to source/test-resources/xforms/tests/schema/range-test.xsd diff --git a/source/test-resources/xforms/tests/schema/read-only-field.xsd b/source/test-resources/xforms/tests/schema/read-only-field.xsd new file mode 100644 index 0000000000..0d254df19e --- /dev/null +++ b/source/test-resources/xforms/tests/schema/read-only-field.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + Identifier + readonly + + + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/interesting-schema-test/recursive-test.xsd b/source/test-resources/xforms/tests/schema/recursive-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/interesting-schema-test/recursive-test.xsd rename to source/test-resources/xforms/tests/schema/recursive-test.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-constraints.xsd b/source/test-resources/xforms/tests/schema/repeat-constraints.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-constraints.xsd rename to source/test-resources/xforms/tests/schema/repeat-constraints.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-multi.xsd b/source/test-resources/xforms/tests/schema/repeat-multi.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-multi.xsd rename to source/test-resources/xforms/tests/schema/repeat-multi.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-nested-simple.xsd b/source/test-resources/xforms/tests/schema/repeat-nested-simple.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-nested-simple.xsd rename to source/test-resources/xforms/tests/schema/repeat-nested-simple.xsd diff --git a/source/test-resources/xforms/customer-tests/repeat-nested-from-will-abson.xsd b/source/test-resources/xforms/tests/schema/repeat-nested-test.xsd similarity index 100% rename from source/test-resources/xforms/customer-tests/repeat-nested-from-will-abson.xsd rename to source/test-resources/xforms/tests/schema/repeat-nested-test.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-submit-test.xsd b/source/test-resources/xforms/tests/schema/repeat-submit-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-submit-test.xsd rename to source/test-resources/xforms/tests/schema/repeat-submit-test.xsd diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-textarea.xsd b/source/test-resources/xforms/tests/schema/repeat-textarea.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/repeat-tests/repeat-textarea.xsd rename to source/test-resources/xforms/tests/schema/repeat-textarea.xsd diff --git a/source/test-resources/xforms/tests/schema/schema-from-forum.xsd b/source/test-resources/xforms/tests/schema/schema-from-forum.xsd new file mode 100644 index 0000000000..4caca82f78 --- /dev/null +++ b/source/test-resources/xforms/tests/schema/schema-from-forum.xsd @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + English + + + + + + + Français + + + + + + + + + + + + + + + + + + + + + How much will appear on index? + + + + + + + \ No newline at end of file diff --git a/source/test-resources/xforms/unit-tests/simple-test/select1-test.xsd b/source/test-resources/xforms/tests/schema/select1-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/select1-test.xsd rename to source/test-resources/xforms/tests/schema/select1-test.xsd diff --git a/source/test-resources/xforms/customer-tests/monks-switch-test.xsd b/source/test-resources/xforms/tests/schema/switch-test.xsd similarity index 100% rename from source/test-resources/xforms/customer-tests/monks-switch-test.xsd rename to source/test-resources/xforms/tests/schema/switch-test.xsd diff --git a/source/test-resources/xforms/tests/schema/test-asset-pickers.xsd b/source/test-resources/xforms/tests/schema/test-asset-pickers.xsd new file mode 100644 index 0000000000..e3808edf7a --- /dev/null +++ b/source/test-resources/xforms/tests/schema/test-asset-pickers.xsd @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/source/test-resources/xforms/unit-tests/simple-test/upload-simple-test.xsd b/source/test-resources/xforms/tests/schema/upload-simple-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/simple-test/upload-simple-test.xsd rename to source/test-resources/xforms/tests/schema/upload-simple-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/annotation-test.xsd b/source/test-resources/xforms/unit-tests/annotation-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/annotation-test.xsd rename to source/test-resources/xforms/unit-tests/annotation-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/constraint-test.xsd b/source/test-resources/xforms/unit-tests/constraint-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/constraint-test.xsd rename to source/test-resources/xforms/unit-tests/constraint-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/derived-type-test.xsd b/source/test-resources/xforms/unit-tests/derived-type-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/derived-type-test.xsd rename to source/test-resources/xforms/unit-tests/derived-type-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/number-test.xsd b/source/test-resources/xforms/unit-tests/number-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/number-test.xsd rename to source/test-resources/xforms/unit-tests/number-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/one-string-test.xsd b/source/test-resources/xforms/unit-tests/one-string-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/one-string-test.xsd rename to source/test-resources/xforms/unit-tests/one-string-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/recursive-test.xsd b/source/test-resources/xforms/unit-tests/recursive-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/recursive-test.xsd rename to source/test-resources/xforms/unit-tests/recursive-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/repeat-constraints-test.xsd b/source/test-resources/xforms/unit-tests/repeat-constraints-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/repeat-constraints-test.xsd rename to source/test-resources/xforms/unit-tests/repeat-constraints-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/root-element-with-extension-test.xsd b/source/test-resources/xforms/unit-tests/root-element-with-extension-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/root-element-with-extension-test.xsd rename to source/test-resources/xforms/unit-tests/root-element-with-extension-test.xsd diff --git a/source/test-resources/xforms/unit-tests/automated/switch-test.xsd b/source/test-resources/xforms/unit-tests/switch-test.xsd similarity index 100% rename from source/test-resources/xforms/unit-tests/automated/switch-test.xsd rename to source/test-resources/xforms/unit-tests/switch-test.xsd