svn commit: r701855 - in /ofbiz/trunk/applications/content: servicedef/ widget/cms/ widget/compdoc/ widget/content/ widget/forum/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r701855 - in /ofbiz/trunk/applications/content: servicedef/ widget/cms/ widget/compdoc/ widget/content/ widget/forum/

mrisaliti
Author: mrisaliti
Date: Sun Oct  5 12:14:33 2008
New Revision: 701855

URL: http://svn.apache.org/viewvc?rev=701855&view=rev
Log:
Some cleanup on content component (Part of issue OFBIZ-1982)

Modified:
    ofbiz/trunk/applications/content/servicedef/services.xml
    ofbiz/trunk/applications/content/servicedef/services_data.xml
    ofbiz/trunk/applications/content/servicedef/services_survey.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml

Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Sun Oct  5 12:14:33 2008
@@ -1064,6 +1064,7 @@
         <attribute name="blogContentId" type="String" mode="IN" optional="false"/>
         <attribute name="summaryData" type="String" mode="IN" optional="true"/>
     </service>
+    <!-- TO BE REMOVED
     <service name="updateBlogEntry" engine="simple" transaction-timeout="300" auth="true"
             location="org/ofbiz/content/blog/BlogServices.xml" invoke="updateBlogEntry">
         <description>Creates content records for a blog entry</description>
@@ -1072,6 +1073,7 @@
         <attribute name="blogContentId" type="String" mode="IN" optional="false"/>
         <attribute name="summaryData" type="String" mode="IN" optional="true"/>
     </service>
+    -->
 
     <service name="persistBlogAll" engine="java" location="org.ofbiz.content.blog.BlogServices" invoke="persistBlogAll"
          auth="true"  transaction-timeout="72000">

Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_data.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_data.xml Sun Oct  5 12:14:33 2008
@@ -241,9 +241,11 @@
         <attribute mode="IN" name="dataResourceTypeId" optional="true" type="String"/>
         <attribute mode="IN" name="objectInfo" optional="true" type="String"/>
     </service>
+    <!-- TO BE REMOVED
     <service name="removeFile" engine="simple"
             location="org/ofbiz/content/data/DataServices.xml" invoke="removeFile" auth="true">
         <description>Remove File</description>
         <attribute mode="IN" name="rootDir" optional="true" type="String"/>
     </service>    
+    -->
 </services>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Sun Oct  5 12:14:33 2008
@@ -45,6 +45,7 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     
+    <!--  TODO
     <service name="cloneSurvey" auth="true" engine="simple"
             location="org/ofbiz/content/survey/SurveyServices.xml" invoke="cloneSurvey">
         <description>Clone a Survey; NOTE: not yet implemented</description>
@@ -52,6 +53,7 @@
         <attribute name="surveyId" type="String" mode="IN"/>
         <attribute name="newSurveyId" type="String" mode="OUT"/>
     </service>
+    -->
 
     <!-- SurveyMultiResp Services -->
     <service name="createSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple"

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sun Oct  5 12:14:33 2008
@@ -121,7 +121,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>    
-                                        <include-form name="AddContent" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                        <include-form name="EditContent" location="component://content/webapp/content/cms/CMSForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sun Oct  5 12:14:33 2008
@@ -455,6 +455,7 @@
         <field name="newDataResourceId" widget-style="inputBox"></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit/></field>
     </form>
+    <!-- TO BE REMOVED
     <form name="ListContentRevisionItemApproval" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
@@ -477,7 +478,7 @@
             <hyperlink also-hidden="false" description="Create" target="EditContentRevisionItem"/>
         </field>
     </form>
-    
+    -->
     <form name="UploadCompDocContent" type="upload" target="uploadCompDocContent"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="caContentIdTo" entry-name="contentIdTo" map-name="contentAssoc"><hidden/></field>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Oct  5 12:14:33 2008
@@ -1251,6 +1251,7 @@
             </widgets>
         </section>
     </screen>
+    <!-- TO BE REMOVED
     <screen name="ListContentRevisionItemApproval">
         <section>
             <condition>
@@ -1281,6 +1282,7 @@
             </widgets>
         </section>
     </screen>
+    -->
     <screen name="EditCompDocContentRole">
         <section>
             <condition>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun Oct  5 12:14:33 2008
@@ -244,7 +244,7 @@
             </widgets>
         </section>
     </screen>
-    <!--screen name="AddDataResource">
+    <screen name="AddDataResource">
         <section>
             <actions>
                 <set field="headerItem" value="DataResource"/>
@@ -258,7 +258,7 @@
                 </decorator-screen>
             </widgets>
         </section>
-    </screen-->
+    </screen>
     <screen name="AddDataResourceText">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=701855&r1=701854&r2=701855&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Sun Oct  5 12:14:33 2008
@@ -285,7 +285,7 @@
                                             <container style="screenlet-body">
                                                 <section>
                                                     <widgets>    
-                                                        <include-form name="EditForumMessage" location="component://content/widget/forum/ForumForms.xml"/>
+                                                        <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/>
                                                     </widgets>
                                                 </section>
                                             </container>