svn commit: r1787473 - in /ofbiz/ofbiz-framework/trunk: .gitignore applications/content/data/TemplateData.xml framework/base/config/component-load.xml framework/base/dtd/ofbiz-component.xsd tools/applyOfbizPatchesAndHotDeploy.sh tools/svnUpHotdeploy.bat

Author: jleroux
Date: Fri Mar 17 18:39:25 2017
New Revision: 1787473

URL: http://svn.apache.org/viewvc?rev=1787473&view=rev
Log:
Completed: Removes the now useless hot-deploy directory
(OFBIZ-9268)

The hot-deploy removal was discussed at https://s.apache.org/7Y2w

This completes the previous commit at r1787461

Note:
We need to remove or implement with Gradle the "depends-on" feature in
ofbiz-component files
IMO, the applyOfbizPatchesAndHotDeploy.sh and svnUpHotdeploy.bat scrupts should
be removed, done



Removed:
    ofbiz/ofbiz-framework/trunk/tools/applyOfbizPatchesAndHotDeploy.sh
    ofbiz/ofbiz-framework/trunk/tools/svnUpHotdeploy.bat
Modified:
    ofbiz/ofbiz-framework/trunk/.gitignore
    ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml
    ofbiz/ofbiz-framework/trunk/framework/base/config/component-load.xml
    ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd

Modified: ofbiz/ofbiz-framework/trunk/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/.gitignore?rev=1787473&r1=1787472&r2=1787473&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/.gitignore (original)
+++ ofbiz/ofbiz-framework/trunk/.gitignore Fri Mar 17 18:39:25 2017
@@ -1,40 +1,39 @@
-bin/
-build/
-applications/*/build
-framework/*/build
-hot-deploy/*/build
-plugins/*/build
-runtime/git-rebase/*
-runtime/SvnInfo.ftl
-runtime/GitInfo.ftl
-runtime/test-list-build.xml
-runtime/logs/access_log.*
-runtime/logs/*.log*
-runtime/logs/*.html*
-runtime/logs/test-results/*
-runtime/logs/birt
-runtime/data/derby/*
-runtime/data/utilcache.*
-runtime/catalina/work/*
-runtime/tempfiles/*
-runtime/indexes/products/
-!runtime/tempfiles/README
-applications/content/index/
-changelog
-.classpath
-.project
-.settings
-.gradle/
-.groovy
-.pc
-.DS_Store
-desktop.ini
-.idea
-*.iml
-*.ipr
-*.iws
-*~
-*#
-.*.swp
-.*.swo
+bin/
+build/
+applications/*/build
+framework/*/build
+plugins/*/build
+runtime/git-rebase/*
+runtime/SvnInfo.ftl
+runtime/GitInfo.ftl
+runtime/test-list-build.xml
+runtime/logs/access_log.*
+runtime/logs/*.log*
+runtime/logs/*.html*
+runtime/logs/test-results/*
+runtime/logs/birt
+runtime/data/derby/*
+runtime/data/utilcache.*
+runtime/catalina/work/*
+runtime/tempfiles/*
+runtime/indexes/products/
+!runtime/tempfiles/README
+applications/content/index/
+changelog
+.classpath
+.project
+.settings
+.gradle/
+.groovy
+.pc
+.DS_Store
+desktop.ini
+.idea
+*.iml
+*.ipr
+*.iws
+*~
+*#
+.*.swp
+.*.swo
 *.patch
\ No newline at end of file

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml?rev=1787473&r1=1787472&r2=1787473&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/TemplateData.xml Fri Mar 17 18:39:25 2017
@@ -23,14 +23,12 @@ under the License.
     <DataResource dataResourceId="AFIBC_LOGO" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="SFIBC Logo" objectInfo="sfibc_logo.png"/>
     <DataResource dataResourceId="AGEP_LOGO" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="AGEP Logo" objectInfo="agep_logo.png"/>
     <DataResource dataResourceId="AGINC_LOGO" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="AGINC Logo" objectInfo="aginc_logo.png"/>
-    <!--DataResource dataResourceId="ARTICLE_WRAP" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="FTL" objectInfo="/hot-deploy/blog/webapp/blog/ArticleWrap.ftl"/-->
     <DataResource dataResourceId="ARTICLE_WRAP" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="FTL" />
     <DataResource dataResourceId="LEFTBAR" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Left Bar" objectInfo="LEFT BAR"/>
     <DataResource dataResourceId="RP_MEDAL" dataResourceTypeId="IMAGE_OBJECT" dataTemplateTypeId="NONE" dataResourceName="Project Reliance Medallion Logo" objectInfo="pr_medal.png"/>
     <DataResource dataResourceId="TMPLT_IMG_CENTER" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Image Centered" mimeTypeId="text/html"/>
     <DataResource dataResourceId="TEMPLATE_IMAGE_LEFT" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Image Left" mimeTypeId="text/html"/>
     <DataResource dataResourceId="TEMPLATE_TEXT_ONLY" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Template Text" mimeTypeId="text/html"/>
-    <!--DataResource dataResourceId="VIEW_WRAP" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="FTL" objectInfo="/hot-deploy/blog/webapp/blog/ViewWrap.ftl"/-->
     <DataResource dataResourceId="VIEW_WRAP" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="FTL"/>
     <DataResource dataResourceId="WRAP_ARTICLE" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"/>
     <DataResource dataResourceId="WRAP_ARTICLE_TABLE" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" dataResourceName="Article wrap with table elements"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/base/config/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/config/component-load.xml?rev=1787473&r1=1787472&r2=1787473&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/config/component-load.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/config/component-load.xml Fri Mar 17 18:39:25 2017
@@ -24,5 +24,4 @@ under the License.
     <load-components parent-directory="themes"/>
     <load-components parent-directory="applications"/>
     <load-components parent-directory="plugins"/>
-    <load-components parent-directory="hot-deploy"/>
 </component-loader>

Modified: ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd?rev=1787473&r1=1787472&r2=1787473&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/dtd/ofbiz-component.xsd Fri Mar 17 18:39:25 2017
@@ -46,7 +46,7 @@ under the License.
                         This is yet unimplemented. It's not a trivial implementation because at the moment components are loaded
                         in the order they are found (i.e. alphabetic or creation date).
                         While this feature would require them all to be located first and then reordered and loaded.
-                        So, for now, simply follow the README file in hot-deploy root folder.
+                        So, for now, simply follow the README file in plugins(?) root folder.
                     </xs:documentation>
                 </xs:annotation>
             </xs:attributeGroup>