Author: jacopoc
Date: Tue Sep 2 14:18:17 2014
New Revision: 1622010
URL: http://svn.apache.org/r1622010
Log:
Removed old code for JPublish
Removed:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/OPTIONAL_LIBRARIES
ofbiz/trunk/applications/content/config/content.properties
ofbiz/trunk/applications/content/data/TemplateData.xml
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
ofbiz/trunk/framework/webapp/build.xml
ofbiz/trunk/macros.xml
Modified: ofbiz/trunk/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Tue Sep 2 14:18:17 2014
@@ -190,7 +190,7 @@
<classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
<classpathentry kind="src" path="framework/start/src"/>
<classpathentry 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
excluding="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"/>
<classpathentry kind="src" path="specialpurpose/assetmaint/src"/>
Modified: ofbiz/trunk/OPTIONAL_LIBRARIES
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/OPTIONAL_LIBRARIES?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/OPTIONAL_LIBRARIES (original)
+++ ofbiz/trunk/OPTIONAL_LIBRARIES Tue Sep 2 14:18:17 2014
@@ -7,27 +7,6 @@ to change to include them in the OFBiz b
NOTE: While these aren't included in the main SVN repository they are available
on the old Undersun SVN server in the specialized/libraries component
directory.
--=- Web Presentation:
________________________________________________________________________________________________________________________________________________
-
--JPublish/EdenLib (Apache):
- NOTE: these were removed for library compatibility reasons, not for license
- reasons; working these back in may be tricky
- http://sourceforge.net/projects/jpublish
- http://edenlib.sourceforge.net/
- framework/webapp/lib:
- JPublish.jar
- EdenLib.jar
- TO BUILD comment out exclude: framework/webapp/build.xml:
- org/ofbiz/webapp/view/GenericViewRenderer.java
- org/ofbiz/webapp/view/JPublishViewHandler.java
- org/ofbiz/webapp/view/JPublishWrapper.java
- org/ofbiz/webapp/view/FopPdfViewHandler.java
- org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
- org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java
- org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java
- AND uncomment the jpublish type section portions of:
- org/ofbiz/webapp/region/Section.java
-
-=- Scripting:
________________________________________________________________________________________________________________________________________________
-JavaScript/Rhino (NPL 1.1):
Modified: ofbiz/trunk/applications/content/config/content.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/content.properties?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/content.properties (original)
+++ ofbiz/trunk/applications/content/config/content.properties Tue Sep 2
14:18:17 2014
@@ -28,10 +28,6 @@ permissionRecorderOn=true
allowedHasRoleOperations=HAS_USER_ROLE|HAS_AUTHOR_ROLE|HAS_EDITOR_ROLE|HAS_ADMIN_ROLE|HAS_PUBLISHER_ROLE
viewSize=10
-# some properties used to put comments around freemarker template blocks using
the FreeMarkerViewRenderer
-freemarker.showTemplateId=Y
-freemarker.templateIdPrefix=[system]
-
# user level content uploading (relative to ofbiz.home)
content.upload.path.prefix=runtime/uploads
content.upload.max.files=250
Modified: ofbiz/trunk/applications/content/data/TemplateData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/TemplateData.xml (original)
+++ ofbiz/trunk/applications/content/data/TemplateData.xml Tue Sep 2 14:18:17
2014
@@ -337,12 +337,6 @@ ResourceId=${subDataResourceId?if_exists
<br/>
</@checkPermission>
</td></tr>
-<#-- can't include this file because this template is not run thru JPublish
and it, therefore,
- does not know where to find nextprev.ftl.
- Looks like Configuration.setDirectoryForTemplateLoading could be used,
but I don't want to
- worry about passing a request object down to this level, at this time.
-<#include "nextprev.ftl"/>
--->
<#assign outputIndex = 0/>
<#if outputIndex?exists >
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
Tue Sep 2 14:18:17 2014
@@ -177,28 +177,6 @@ public class ContentManagementWorker {
return ret;
}
- //public static String getFromSomewhere(String name, LinkedHashMap
paramMap, HttpServletRequest request, org.jpublish.JPublishContext context) {
- /* This method should no longer be in use; the JPublish library was
removed by default from OFBiz
- public static String getFromSomewhere(String name, Map paramMap,
HttpServletRequest request, org.jpublish.JPublishContext context) {
-
- String ret = null;
- if (paramMap != null)
- ret = (String)paramMap.get(name);
-
- if (UtilValidate.isEmpty(ret)) {
- Object obj = request.getAttribute(name);
- if (obj != null) {
- ret = obj.toString();
- } else {
- obj = context.get(name);
- if (obj != null) {
- ret = obj.toString();
- }
- }
- }
- return ret;
- } */
-
public static void getCurrentValue(HttpServletRequest request, Delegator
delegator) {
HttpSession session = request.getSession();
Map<String, GenericPK> currentEntityMap =
UtilGenerics.checkMap(session.getAttribute("currentEntityMap"));
Modified: ofbiz/trunk/framework/webapp/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/build.xml?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/build.xml (original)
+++ ofbiz/trunk/framework/webapp/build.xml Tue Sep 2 14:18:17 2014
@@ -52,13 +52,6 @@ under the License.
<exclude
name="org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java"/>
<exclude
name="org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java"/>
<exclude
name="org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java"/>
- <!-- JPublish/EdenLib dependent files -->
- <exclude name="org/ofbiz/webapp/view/GenericViewRenderer.java"/>
- <exclude name="org/ofbiz/webapp/view/JPublishViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/view/JPublishWrapper.java"/>
- <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
- <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
</patternset>
<target name="jar" depends="classes">
Modified: ofbiz/trunk/macros.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1622010&r1=1622009&r2=1622010&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Tue Sep 2 14:18:17 2014
@@ -110,12 +110,6 @@ under the License.
<exclude name="**/JasperReportsXmlViewHandler.java"/>
<exclude name="**/JasperReportsJXlsViewHandler.java"/>
<exclude name="**/JasperReportsPoiXlsViewHandler.java"/>
- <exclude name="**/GenericViewRenderer.java"/>
- <exclude name="**/JPublishViewHandler.java"/>
- <exclude name="**/JPublishWrapper.java"/>
- <exclude name="**/FopPdfViewHandler.java"/>
- <exclude name="**/FreeMarkerViewRenderer.java"/>
- <exclude name="**/JpCacheIncludeTransform.java"/>
</fileset>
<link href="http://java.sun.com/javase/7/docs/api/"; offline="true"
packagelistLoc="${ofbiz.home.dir}/tools/api-java17"/>
</javadoc>
