Fixes issue 23082: Removes smart sprites functionality
authorAugusto Mauch <augusto.mauch@openbravo.com>
Thu, 21 Mar 2013 16:30:17 +0100
changeset 19956 0c44af13571d
parent 19955 815746476942
child 19957 47d740ad4b2c
Fixes issue 23082: Removes smart sprites functionality

The root cause of the fix is that there two versions of the google collections library. The old one, located in lib/build/google-collections.jar was only used for the smart sprites functionality, that only applies to 2.50 windows and to the login window. This functionality does not work with the neweste version of the google collections library (modules/org.openbravo.base.weld/lib/runtime/google-collect-1.0.jar).

It has been decided that this feature is going to be removed. It has almost no significance in Openbravo 3.0, in fact it is disabled by default. Changes done:
- Removed now unused libraries:
* lib/build/commons-math-1.2.jar
* lib/build/google-collections.jar
* lib/build/smartsprites-0.2.1-alpha.jar

- Removed functionality from src/build.xml

- Removed configuration option from Openbravo.properties.template

- Updated legal folder
config/Openbravo.properties.template
legal/Licensing.txt
src/build.xml
--- a/config/Openbravo.properties.template	Thu Mar 21 19:32:06 2013 +0530
+++ b/config/Openbravo.properties.template	Thu Mar 21 16:30:17 2013 +0100
@@ -101,9 +101,6 @@
 bbdd.outputscript=databasescript.sql
 bbdd.verbosity=INFO
 
-# CSS Sprites Generator
-generateSprites=no
-
 # use js/css minimization (in local-context and war-file)
 minimizeJSandCSS=yes
 
--- a/legal/Licensing.txt	Thu Mar 21 19:32:06 2013 +0530
+++ b/legal/Licensing.txt	Thu Mar 21 16:30:17 2013 +0100
@@ -110,10 +110,8 @@
 # commons-io-2.0.1.jar
 # commons-lang-2.6.jar
 # commons-logging-1.1.1.jar
-# commons-math-1.2.jar
 # commons-pool-1.5.6.jar
 # fop.jar
-# google-collections.jar
 # jakarta-oro-2.0.8.jar
 # jettison-1.3.jar
 # log4j-1.2.16.jar
@@ -128,9 +126,6 @@
 # postgresql-9.0-801.jdbc4.jar
 Under the BSD license, also available at http://jdbc.postgresql.org/license.html  
 
-# smartsprites-0.2.1-alpha.jar
-Under a modified BSD license (the smartsprites.license.txt), also available at http://smartsprites.osinski.name/
-
 # xstream-1.3.1.jar
 Under a modified BSD license available at http://xstream.codehaus.org/license.html
 
--- a/src/build.xml	Thu Mar 21 19:32:06 2013 +0530
+++ b/src/build.xml	Thu Mar 21 16:30:17 2013 +0100
@@ -627,10 +627,6 @@
     
     <antcall target="build.web.folder.skins"  inheritAll="true" inheritrefs="true" />
     
-    <condition property="generateSpritesBool">
-        <istrue value="${generateSprites}" />
-    </condition>
-    <antcall target="generate.sprites" inheritAll="true" inheritrefs="true" />
     <antcall target="minimizeJSandCSS" inheritAll="true" inheritrefs="true" />
   </target>
     
@@ -683,20 +679,6 @@
     
   </target>
 
-  <target name="generate.sprites" description="Performs CSS sprite processing" if="generateSpritesBool">
-    <property name="skins.location" location="${base.context}/web/skins/" />
-    <taskdef name="smartsprites" classname="org.carrot2.labs.smartsprites.ant.SmartSpritesTask">
-      <classpath refid="project.class.path" />
-    </taskdef>
-    <smartsprites rootdir="${skins.location}" documentrootdir="${skins.location}" outputdir="${skins.location}" cssfilesuffix="-sprite" csspropertyindent="  " loglevel="WARN" spritepngdepth="DIRECT" spritepngie6="false" />
-    <move todir="${skins.location}">
-      <fileset dir="${skins.location}">
-        <include name="**/*-sprite.css" />
-      </fileset>
-      <mapper type="glob" from="*-sprite.css" to="*.css" />
-    </move>
-  </target>
-
   <target name="minimizeJSandCSS" description="minimize JS and CSS files" if="minimizeJSandCSSbool">
     <yuicompress linebreak="300" warn="false" munge="yes" preserveallsemicolons="true" outputfolder="${base.context}/web" charset="UTF-8">
       <fileset dir="${base.web}">