svn commit: r1356471 - in /ofbiz/trunk: ./ framework/entity/ framework/entity/lib/ framework/entity/src/org/ofbiz/entity/connection/ framework/entity/src/org/ofbiz/entity/transaction/ framework/webtools/config/ framework/webtools/webapp/webtools/entity...

Author: jleroux
Date: Mon Jul  2 20:29:54 2012
New Revision: 1356471

URL: http://svn.apache.org/viewvc?rev=1356471&view=rev
Log:
"Housekeeping of jar files"  https://issues.apache.org/jira/browse/OFBIZ-4833
Moves Minerva and XAPool to Attic

Removed:
    ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/MinervaConnectionFactory.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/TyrexConnectionFactory.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/XaPoolConnectionFactory.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TyrexFactory.java
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/minervaObjects.ftl
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/entity/build.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Jul  2 20:29:54 2012
@@ -114,7 +114,6 @@
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
-    <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
@@ -181,7 +180,6 @@
     <classpathentry kind="src" path="framework/catalina/src"/>
     <classpathentry kind="src" path="framework/common/src"/>
     <classpathentry kind="src" path="framework/datafile/src"/>
-    <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
     <classpathentry kind="src" path="framework/entityext/src"/>
     <classpathentry kind="src" path="framework/geronimo/src"/>
     <classpathentry kind="src" path="framework/jetty/src"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Jul  2 20:29:54 2012
@@ -1218,7 +1218,6 @@ The following libraries distributed with
 MIT/X License:
 ofbiz/trunk/framework/base/lib/icu4j-49_1.jar
 ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar
-ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar
 ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar
 ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar
 ofbiz/trunk/framework/images/webapp/images/jquery/*

Modified: ofbiz/trunk/framework/entity/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/build.xml?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/build.xml (original)
+++ ofbiz/trunk/framework/entity/build.xml Mon Jul  2 20:29:54 2012
@@ -41,8 +41,6 @@ under the License.
     </path>
 
     <patternset id="src.exc.set">
-        <exclude name="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/>
-        <exclude name="org/ofbiz/entity/connection/TyrexConnectionFactory.java"/>
     </patternset>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Mon Jul  2 20:29:54 2012
@@ -3052,15 +3052,6 @@
         <value xml:lang="zh">内存</value>
         <value xml:lang="zh_TW">記憶體</value>
     </property>
-    <property key="WebtoolsMinervaConnectionObjects">
-        <value xml:lang="de">Minerva Verbindungsobjekte</value>
-        <value xml:lang="en">Minerva Connection Objects</value>
-        <value xml:lang="it">Oggetti connessione Minerva</value>
-        <value xml:lang="pt">Objetos de Conexão Minerva</value>
-        <value xml:lang="vi">Đối tượng kết nối Minerva</value>
-        <value xml:lang="zh">智能连接对象</value>
-        <value xml:lang="zh_TW">智慧連接物件</value>
-    </property>
     <property key="WebtoolsMiscSetupTools">
         <value xml:lang="de">Versch. Setup Tools</value>
         <value xml:lang="en">Misc. Setup Tools</value>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Mon Jul  2 20:29:54 2012
@@ -437,23 +437,6 @@ under the License.
         </section>
     </screen>
 
-    <screen name="minervaobjects">
-        <section>
-            <actions>
-                <set field="headerItem" value="main"/>
-                <set field="title" value="${uiLabelMap.WebtoolsMinervaConnectionObjects}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.WebtoolsMinervaConnectionObjects}">
-                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/minervaObjects.ftl"/></html></platform-specific>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="ConnectionPoolStatus">
         <section>
             <actions>

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1356471&r1=1356470&r2=1356471&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Mon Jul  2 20:29:54 2012
@@ -109,8 +109,6 @@ under the License.
         <exclude name="**/JREntityListIteratorDataSource.java"/>
         <exclude name="**/JRMapCollectionDataSource.java"/>
         <exclude name="**/openoffice/"/>
-        <exclude name="**/XaPoolConnectionFactory.java"/>
-        <exclude name="**/JasperReportsPdfViewHandler.java"/>
         <exclude name="**/JasperReportsXmlViewHandler.java"/>
         <exclude name="**/JasperReportsJXlsViewHandler.java"/>
         <exclude name="**/JasperReportsPoiXlsViewHandler.java"/>