svn commit: r1083861 - in /ofbiz/trunk: applications/content/data/WebtoolsHelpData.xml framework/example/data/ExampleDemoData.xml

[erwan]

Author: erwan
Date: Mon Mar 21 16:37:42 2011
New Revision: 1083861

URL: http://svn.apache.org/viewvc?rev=1083861&view=rev
Log:
Moving the example selenium testsuite from it belongs and make it loads only when loading demo data

Modified:
    ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml
    ofbiz/trunk/framework/example/data/ExampleDemoData.xml

Modified: ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml?rev=1083861&r1=1083860&r2=1083861&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml Mon Mar 21 16:37:42 2011
@@ -19,10 +19,7 @@
 -->
 
 <entity-engine-xml>
-    <!-- example test suite -->
-    <SeleniumTestSuitePath testSuiteId="EXAMPLE_TESTSUITE" testSuiteName="example_testsuite" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/>
-    
-    <DataResource dataResourceId="HELP_WEBTOOLS" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+    <DataResource dataResourceId="HELP_WEBTOOLS" localeString="en" dataResourceTypeId="OFBIZ_FILE"
         objectInfo="framework/webtools/data/helpdata/HELP_WEBTOOLS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
         dataResourceName="Webtools Overview" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="HELP_WEBTOOLS" contentTypeId="DOCUMENT" contentName="Framework Webtools" templateDataResourceId="HELP_TEMPL"
@@ -38,12 +35,9 @@
         objectInfo="framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Selenium help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="WEBTOOLS_selenium" contentTypeId="DOCUMENT" contentName="Selenium test." templateDataResourceId="HELP_TEMPL" dataResourceId="WEBTOOLS_selenium" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
     <ContentAssoc contentId="HELP_WEBTOOLS" contentIdTo="WEBTOOLS_selenium" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="WEBTOOLS_selenium"/>
-    
-    
+
     <!--Selenium Help  Load in contentTypeData.xml file -->
     <DataResource dataResourceId="SELENIUM_HTTPS" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/testtools/documents/OfbizSeleniumSetupHTTPS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ofbiz Selenium HTTPS" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="SELENIUM_HTTPS" contentTypeId="DOCUMENT" contentName="OFBiz Selenium with HTTPS" templateDataResourceId="HELP_TEMPL" dataResourceId="SELENIUM_HTTPS" localeString="en" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>    
     <ContentAssoc contentId="DOCUMENTS" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum="" />
-    
-    
  </entity-engine-xml>

Modified: ofbiz/trunk/framework/example/data/ExampleDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExampleDemoData.xml?rev=1083861&r1=1083860&r2=1083861&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/ExampleDemoData.xml (original)
+++ ofbiz/trunk/framework/example/data/ExampleDemoData.xml Mon Mar 21 16:37:42 2011
@@ -63,4 +63,7 @@ under the License.
     <Example exampleId="EX10" exampleName="Example 10" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
     <Example exampleId="EX11" exampleName="Example 11" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
     <Example exampleId="EX12" exampleName="Example 12" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+
+    <!-- example test suite -->
+    <SeleniumTestSuitePath testSuiteId="EXAMPLE_TESTSUITE" testSuiteName="example_testsuite" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/>
 </entity-engine-xml>