svn commit: r1354380 - in /ofbiz/trunk: ./ applications/content/data/ applications/marketing/ applications/marketing/data/ framework/testtools/ framework/testtools/config/ framework/testtools/data/ framework/testtools/documents/ framework/testtools/dtd...

[jacopoc]

Author: jacopoc
Date: Wed Jun 27 09:19:20 2012
New Revision: 1354380

URL: http://svn.apache.org/viewvc?rev=1354380&view=rev
Log:
As discussed in the dev list a few months ago, this commits removes Seleniumxml from the trunk.
Seleniumxml was a subcomponent of the framework/testtools intended to facilitate the usage of Selenium tests in OFBiz.
However it was never upgraded to the new version of Selenium and it has not been widely adopted by the community; the OFBiz community agreed to remove components/tools like this from the core distribution if they are optional/very specific or not well maintained or if there is (as in the case of Selenium) a valid external alternative to perform the same actions.

Removed:
    ofbiz/trunk/applications/marketing/data/MarketingDemoData.xml
    ofbiz/trunk/framework/testtools/OFBizSeleniumXmlIntro.pdf
    ofbiz/trunk/framework/testtools/config/
    ofbiz/trunk/framework/testtools/convertSeleniumIDE.bat
    ofbiz/trunk/framework/testtools/convertSeleniumIDE.sh
    ofbiz/trunk/framework/testtools/data/
    ofbiz/trunk/framework/testtools/documents/
    ofbiz/trunk/framework/testtools/dtd/SeleniumXml.xsd
    ofbiz/trunk/framework/testtools/entitydef/
    ofbiz/trunk/framework/testtools/lib/selenium-java-client-driver.jar
    ofbiz/trunk/framework/testtools/runSeleniumServer.bat
    ofbiz/trunk/framework/testtools/runSeleniumServer.sh
    ofbiz/trunk/framework/testtools/runSeleniumXml.bat
    ofbiz/trunk/framework/testtools/runSeleniumXml.sh
    ofbiz/trunk/framework/testtools/script/
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/selenium/
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/
    ofbiz/trunk/framework/testtools/testdef/
    ofbiz/trunk/framework/testtools/webapp/
    ofbiz/trunk/framework/testtools/widget/
    ofbiz/trunk/specialpurpose/example/testdef/selenium/
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml
    ofbiz/trunk/applications/marketing/ofbiz-component.xml
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/testtools/build.xml
    ofbiz/trunk/framework/testtools/ofbiz-component.xml
    ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml
    ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/widget/Menus.xml
    ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Wed Jun 27 09:19:20 2012
@@ -143,7 +143,6 @@
     <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
     <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
     <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
-    <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/>
     <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/>
@@ -192,7 +191,6 @@
     <classpathentry kind="src" path="framework/sql/src"/>
     <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
     <classpathentry kind="src" path="framework/start/src"/>
-    <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/>
     <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/>
     <classpathentry kind="src" path="framework/webtools/src"/>
     <classpathentry kind="src" path="framework/widget/src"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Jun 27 09:19:20 2012
@@ -92,7 +92,6 @@ ofbiz/trunk/framework/service/lib/axis2-
 ofbiz/trunk/framework/service/lib/commons-httpclient-3.1.jar
 ofbiz/trunk/framework/service/lib/neethi-2.0.4.jar
 ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar
-ofbiz/trunk/framework/testtools/lib/selenium-java-client-driver.jar
 ofbiz/trunk/framework/webapp/lib/fop-1.0.jar
 ofbiz/trunk/framework/webapp/lib/velocity-1.6.1.jar
 ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.4.jar

Modified: ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/WebtoolsHelpData.xml Wed Jun 27 09:19:20 2012
@@ -30,14 +30,4 @@
         objectInfo="framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List parties Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="WEBTOOLS_main" contentTypeId="DOCUMENT" contentName="Webtools main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="WEBTOOLS_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
     <ContentAssoc contentId="HELP_WEBTOOLS" contentIdTo="WEBTOOLS_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="WEBTOOLS_main"/>
-    
-    <DataResource dataResourceId="WEBTOOLS_selenium" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        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>
+</entity-engine-xml>

Modified: ofbiz/trunk/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/marketing/ofbiz-component.xml Wed Jun 27 09:19:20 2012
@@ -32,7 +32,6 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/>
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Wed Jun 27 09:19:20 2012
@@ -150,13 +150,6 @@ under the License.
         </subant>
     </target>
 
-    <target name="download-selenium"
-          description="Download the selenium server v1.0.3 20.8 MB download">
-        <subant target="install-seleniumxml">
-            <filelist dir="." files="framework/testtools/build.xml"/>
-        </subant>
-    </target>
-
     <target name="tests" depends="ofbiz-init">
         <subant target="tests">
             <filelist dir="." files="framework/build.xml"/>

Modified: ofbiz/trunk/framework/testtools/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/build.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/build.xml (original)
+++ ofbiz/trunk/framework/testtools/build.xml Wed Jun 27 09:19:20 2012
@@ -32,7 +32,6 @@ under the License.
     <path id="local.class.path">
         <fileset dir="${lib.dir}" includes="*.jar"/>
         <fileset dir="../base/lib" includes="*.jar"/>
-        <fileset dir="../base/lib/scripting" includes="*.jar"/>
         <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
         <fileset dir="../base/lib/commons" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
@@ -42,59 +41,10 @@ under the License.
         <fileset dir="../service/lib" includes="*.jar"/>
         <fileset dir="../service/build/lib" includes="*.jar"/>
         <fileset dir="../minilang/build/lib" includes="*.jar"/>
-        <fileset dir="../webapp/lib" includes="*.jar"/>
     </path>
     
     <path id="runtime.class.path">
         <fileset dir="${build.dir}/lib" includes="*.jar"/>
     </path>    
     
-    <target name="init">
-        
-        <property name="lib.dir" value="lib"/>
-        <property name="selenium.lib.dir" value="${lib.dir}"/>
-    </target>
-
-    <target name="run-seleniumxml" depends="init, jar" description="Runs the selenium xml test cases">
-        <java classname="org.ofbiz.testtools.seleniumxml.SeleniumXml" fork="true">
-            <jvmarg value="-Dselenium.config=config/seleniumXml.properties"/>
-            <arg value="testdef/seleniumxml/example/example_testsuite.xml"/>
-            <classpath>
-                   <path refid="runtime.class.path"/>
-                <path refid="local.class.path"/>
-              </classpath>
-        </java>
-    </target>
-
-    <target name="run-seleniumserver" depends="init, jar" description="Runs the selenium RC server">
-        <java jar="../../framework/testtools/lib/selenium-server.jar" fork="true">
-            <!-- arg value="-timeout 240"/ -->
-            <classpath>
-                   <path refid="runtime.class.path"/>
-                <path refid="local.class.path"/>
-              </classpath>
-            <arg value="-timeout"/>
-            <arg value="240"/>
-            <arg value="-firefoxProfileTemplate"/>
-            <arg value="./config/firefox_profile"/>
-        </java>
-    </target>
-    
-    <target name="install-seleniumxml" depends="init" description="Download the selenium files">
-        <!--
-            Quick way to download and extract the selenium-server.jar
-            If someone has a better way to do the same, please suggest !
-        -->
-        <get src="http://selenium.googlecode.com/files/selenium-remote-control-1.0.3.zip"
-             dest="${selenium.lib.dir}/selenium-remote-control-1.0.3.zip" usetimestamp="true" verbose="true"/>
-        <unzip src="${selenium.lib.dir}/selenium-remote-control-1.0.3.zip"
-                dest="${selenium.lib.dir}">
-            <patternset>
-                <include name="selenium-server-1.0.3/selenium-server.jar"/>
-            </patternset>
-        </unzip>
-        <move file="${selenium.lib.dir}/selenium-server-1.0.3/selenium-server.jar" todir="${selenium.lib.dir}"/>
-        <delete dir="${selenium.lib.dir}/selenium-server-1.0.3"/>
-        <delete file="${selenium.lib.dir}/selenium-remote-control-1.0.3.zip"/>
-    </target>
 </project>

Modified: ofbiz/trunk/framework/testtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/ofbiz-component.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/testtools/ofbiz-component.xml Wed Jun 27 09:19:20 2012
@@ -23,8 +23,7 @@
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <!-- define resource loaders; most common is to use the component resource loader -->
     <resource-loader name="main" type="component"/>
-    <classpath type="dir" location="config"/>
-    
+
     <!-- place the config directory on the classpath to access configuration files -->
     <classpath type="dir" location="dtd"/>
     
@@ -32,9 +31,6 @@
     <classpath type="jar" location="lib/*"/>
     <classpath type="jar" location="build/lib/*"/>
     
-    <!-- entitydef -->
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    
     <!-- service resources: model(s), eca(s) and group definitions -->
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     

Modified: ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml (original)
+++ ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml Wed Jun 27 09:19:20 2012
@@ -19,5 +19,4 @@ License.
     xmlns="http://docbook.org/ns/docbook">
     <title>The Webtools Introduction.</title>
     <xi:include href="HELP_WEBTOOLS_main.xml" />
-    <xi:include href="../../../testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml" />
 </section>
\ No newline at end of file

Modified: ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml (original)
+++ ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml Wed Jun 27 09:19:20 2012
@@ -47,8 +47,5 @@ License.
       <listitem>
         <para>The <link xl:href="">Portal Page Admin.</link> section is used to browse and edit all Portal Pages defined in the system.</para>
       </listitem>
-      <listitem>
-        <para>The <link xl:href="showHelp?helpTopic=WEBTOOLS_selenium">Tests</link> section is used to run system tests.</para>
-      </listitem>
     </itemizedlist>
 </section>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Wed Jun 27 09:19:20 2012
@@ -24,7 +24,6 @@ under the License.
     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
     <include location="component://common/webcommon/WEB-INF/security-controller.xml"/>
     <include location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
-    <include location="component://testtools/webapp/testtools/WEB-INF/controller.xml"/>
     <description>WebTools Site Configuration File</description>
 
     <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Wed Jun 27 09:19:20 2012
@@ -115,8 +115,6 @@ under the License.
         </#if>
         <li><h3>${uiLabelMap.WebtoolsCertsX509}</h3></li>
         <li><a href="<@ofbizUrl>myCertificates</@ofbizUrl>">${uiLabelMap.WebtoolsMyCertificates}</a></li>
-        <li><h3>Selenium</h3></li>
-        <li><a href="<@ofbizUrl>selenium</@ofbizUrl>">Selenium</a></li>
       </ul>
     </#if>
   </div>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Wed Jun 27 09:19:20 2012
@@ -58,9 +58,6 @@ under the License.
             </condition>
             <link target="security"/>
         </menu-item>
-        <menu-item name="tests" title="Tests">
-            <link target="selenium"/>
-        </menu-item>
         <menu-item name="LayoutDemo" title="${uiLabelMap.WebtoolsLayoutDemo}">
             <link target="WebtoolsLayoutDemo" />
         </menu-item>

Modified: ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml?rev=1354380&r1=1354379&r2=1354380&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml Wed Jun 27 09:19:20 2012
@@ -63,8 +63,4 @@ 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" testSuiteType="XML" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/>
-    <SeleniumTestSuitePath testSuiteId="EX_HTML_TESTSUITE" testSuiteName="example_html_testsuite" testSuiteType="HTML" testSuitePath="framework/example/testdef/selenium/testSuite.html" description="HTML test suite for example component"/>
 </entity-engine-xml>