Author: jacopoc
Date: Sun Sep 7 06:57:19 2014
New Revision: 1622980
URL: http://svn.apache.org/r1622980
Log:
Removed old, not maintained and never really used integration with the Apache
Velocity template engine.
Removed:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/VelocityViewHandler.java
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
ofbiz/trunk/applications/content/data/ContentTypeData.xml
Modified: ofbiz/trunk/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1622980&r1=1622979&r2=1622980&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Sun Sep 7 06:57:19 2014
@@ -144,7 +144,6 @@
<classpathentry kind="lib" path="framework/webapp/lib/iText-2.1.7.jar"/>
<classpathentry kind="lib"
path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
<classpathentry kind="lib"
path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/>
<classpathentry kind="lib"
path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/>
<classpathentry kind="lib"
path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/>
Modified: ofbiz/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1622980&r1=1622979&r2=1622980&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun Sep 7 06:57:19 2014
@@ -98,7 +98,6 @@ framework/service/lib/commons-httpclient
framework/service/lib/neethi-2.0.4.jar
framework/service/lib/XmlSchema-1.4.3.jar
framework/webapp/lib/fop-1.1.jar
-framework/webapp/lib/velocity-1.6.1.jar
framework/webapp/lib/xmlgraphics-commons-1.5.jar
framework/webapp/lib/json-lib-2.2.3-jdk15.jar
framework/webapp/lib/ezmorph-0.9.1.jar
Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentEntityLabels.xml?rev=1622980&r1=1622979&r2=1622980&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentEntityLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentEntityLabels.xml Sun Sep 7
06:57:19 2014
@@ -1901,11 +1901,6 @@
<value xml:lang="zh">å±å¹æä»¶</value>
<value xml:lang="zh_TW">è¢å¹æä»¶</value>
</property>
- <property key="DataTemplateType.description.VTL">
- <value xml:lang="en">Velocity</value>
- <value xml:lang="ro">Viteza</value>
- <value xml:lang="th">à¸à¸§à¸²à¸¡à¹à¸£à¹à¸§</value>
- </property>
<property key="DataTemplateType.description.WM">
<value xml:lang="en">WebMacro</value>
<value xml:lang="th">à¹à¸§à¹à¸ Macro</value>
Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1622980&r1=1622979&r2=1622980&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Sun Sep 7
06:57:19 2014
@@ -138,7 +138,6 @@ under the License.
<DataTemplateType dataTemplateTypeId="NONE" description="No Template"
extension=""/>
<DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker"
extension="ftl"/>
- <DataTemplateType dataTemplateTypeId="VTL" description="Velocity"
extension="vtl"/>
<DataTemplateType dataTemplateTypeId="WM" description="WebMacro"
extension="wm"/>
<DataTemplateType dataTemplateTypeId="XSLT" description="XSLT"
extension="xsl"/>
<DataTemplateType dataTemplateTypeId="SCREEN_COMBINED" description="Screen
widget" extension="xml"/>