svn commit: r1329565 - in /ofbiz/trunk: ./ framework/appserver/templates/glassfish21/ framework/appserver/templates/jboss422/ framework/base/lib/

Author: jleroux
Date: Tue Apr 24 06:41:52 2012
New Revision: 1329565

URL: http://svn.apache.org/viewvc?rev=1329565&view=rev
Log:
"Housekeeping of jar files" https://issues.apache.org/jira/browse/OFBIZ-4833
Trying to upgrade javamail (mail.jar) from 1.4 (our version) to 1.4.5 from Oracle I discovered that it's now distributed under BCL license (Binary Code License) which is not an open source license hence can't be committed.
So we are stuck with the 1.4 version wich is ok I guess and users should upgrade by themself...

Added:
    ofbiz/trunk/framework/base/lib/mail-1.4.jar
      - copied unchanged from r1329562, ofbiz/trunk/framework/base/lib/mail.jar
Removed:
    ofbiz/trunk/framework/base/lib/mail.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/appserver/templates/glassfish21/deploy.sh
    ofbiz/trunk/framework/appserver/templates/jboss422/build.xml
    ofbiz/trunk/framework/appserver/templates/jboss422/deploy.sh

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1329565&r1=1329564&r2=1329565&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Tue Apr 24 06:41:52 2012
@@ -45,7 +45,7 @@
     <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.16.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/nekohtml.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1329565&r1=1329564&r2=1329565&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Tue Apr 24 06:41:52 2012
@@ -1966,7 +1966,7 @@ ofbiz/trunk/framework/base/lib/jdbm-1.0-
 The following library distributed with Apache OFBiz is licensed under the
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL):
 ofbiz/trunk/framework/base/lib/juel-2.1.1.jar (contains the javax.el package)
-ofbiz/trunk/framework/base/lib/mail.jar
+ofbiz/trunk/framework/base/lib/mail-1.4.jar
 ofbiz/trunk/framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar
 ofbiz/trunk/framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar
 ofbiz/trunk/framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar

Modified: ofbiz/trunk/framework/appserver/templates/glassfish21/deploy.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/glassfish21/deploy.sh?rev=1329565&r1=1329564&r2=1329565&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/glassfish21/deploy.sh (original)
+++ ofbiz/trunk/framework/appserver/templates/glassfish21/deploy.sh Tue Apr 24 06:41:52 2012
@@ -95,7 +95,7 @@ fi
 # copy all lib files
 mkdir lib
 <#list classpathJars as jar>
-<#if (!jar.contains("j2eespec") && !jar.contains("catalina") && !jar.contains("mx4j") && !jar.contains("derby-") && !jar.contains("commons-el") && !jar.contains("avalon-framework") && !jar.contains("mail.jar"))>
+<#if (!jar.contains("j2eespec") && !jar.contains("catalina") && !jar.contains("mx4j") && !jar.contains("derby-") && !jar.contains("commons-el") && !jar.contains("avalon-framework") && !jar.contains("mail-1.4.jar"))>
 cp ${jar} ./lib
 </#if>
 </#list>

Modified: ofbiz/trunk/framework/appserver/templates/jboss422/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/jboss422/build.xml?rev=1329565&r1=1329564&r2=1329565&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/jboss422/build.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/jboss422/build.xml Tue Apr 24 06:41:52 2012
@@ -99,7 +99,7 @@
                 <exclude name="**/*bsh*.jar"/>
                 <exclude name="**/*bsf*.jar"/>
                 <exclude name="**/*antlr*.jar"/>
-                <exclude name="**/*mail.jar"/>
+                <exclude name="**/*mail*.jar"/>
                 <exclude name="**/*xerces*.jar"/>
                 <exclude name="**/*xalan*.jar"/>
             </fileset>

Modified: ofbiz/trunk/framework/appserver/templates/jboss422/deploy.sh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/jboss422/deploy.sh?rev=1329565&r1=1329564&r2=1329565&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/jboss422/deploy.sh (original)
+++ ofbiz/trunk/framework/appserver/templates/jboss422/deploy.sh Tue Apr 24 06:41:52 2012
@@ -62,7 +62,7 @@ fi
 # copy all lib files
 mkdir lib
 <#list classpathJars as jar>
-<#if (!jar.contains("j2eespec") && !jar.contains("geronimo") && !jar.contains("catalina") && !jar.contains("mx4j") && !jar.contains("derby-") && !jar.contains("commons-logging") &&!jar.contains("commons-collections") &&!jar.contains("commons-codec") && !jar.contains("commons-el") && !jar.contains("avalon-framework") && !jar.contains("bsh") && !jar.contains("bsf") && !jar.contains("antlr") && !jar.contains("mail.jar"))>
+<#if (!jar.contains("j2eespec") && !jar.contains("geronimo") && !jar.contains("catalina") && !jar.contains("mx4j") && !jar.contains("derby-") && !jar.contains("commons-logging") &&!jar.contains("commons-collections") &&!jar.contains("commons-codec") && !jar.contains("commons-el") && !jar.contains("avalon-framework") && !jar.contains("bsh") && !jar.contains("bsf") && !jar.contains("antlr") && !jar.contains("mail-1.4.jar"))>
 cp ${jar} ./lib
 </#if>
 </#list>