You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/08/16 05:43:07 UTC

svn commit: r1158099 - in /ofbiz/trunk: applications/commonext/data/ applications/commonext/webapp/ofbizsetup/WEB-INF/ applications/content/data/ applications/humanres/data/ applications/humanres/webapp/humanres/WEB-INF/ applications/manufacturing/data...

Author: hansbak
Date: Tue Aug 16 03:43:06 2011
New Revision: 1158099

URL: http://svn.apache.org/viewvc?rev=1158099&view=rev
Log:
remove the rest of the website definitions from seed data, the ones that are left are in the demo data

Modified:
    ofbiz/trunk/applications/commonext/data/SetupData.xml
    ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
    ofbiz/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml
    ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
    ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml
    ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml
    ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml
    ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
    ofbiz/trunk/framework/bi/data/BiTypeData.xml
    ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/web.xml
    ofbiz/trunk/framework/common/data/CommonTypeData.xml
    ofbiz/trunk/framework/example/data/ExampleTypeData.xml
    ofbiz/trunk/framework/example/webapp/birt/WEB-INF/web.xml
    ofbiz/trunk/framework/exampleext/webapp/exampleext/WEB-INF/web.xml
    ofbiz/trunk/framework/resources/templates/web.xml
    ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/web.xml
    ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml
    ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml

Modified: ofbiz/trunk/applications/commonext/data/SetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/SetupData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/SetupData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/SetupData.xml Tue Aug 16 03:43:06 2011
@@ -19,5 +19,4 @@
 -->
 <entity-engine-xml>
     
-    <WebSite webSiteId="SETUP" siteName="Setup Manager" visualThemeSetId="BACKOFFICE"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@
     <description>Setup Manager Module of the Open For Business Project</description>
     
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>SETUP</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Tue Aug 16 03:43:06 2011
@@ -255,8 +255,6 @@ under the License.
     </ElectronicText>
     <Content contentId="STDWRAP001" contentTypeId="DOCUMENT" dataResourceId="STDWRAP001" contentName="Standard SubContent Wrapper" description="Standard SubContent Wrapper"/>
 
-    <WebSite webSiteId="CONTENT_SITE" siteName="Content Manager" visualThemeSetId="BACKOFFICE"/>
-
     <Content contentId="TREE_ROOT"/>
     <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
     <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue Aug 16 03:43:06 2011
@@ -110,8 +110,6 @@ under the License.
     <EmplLeaveType description="Inland Restricted Holiday" hasTable="N" parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/>
     <EmplLeaveType description="Inland Special Day Off" hasTable="N" parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/>
 
-    <WebSite webSiteId="HR" siteName="Human Resource Manager" visualThemeSetId="BACKOFFICE"/>
-        
     <EnumerationType description="Job Posting Types" enumTypeId="JOB_POSTING" hasTable="N" parentTypeId=""/>
     <Enumeration description="Internal Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_INTR" sequenceId="01" enumTypeId="JOB_POSTING"/>
     <Enumeration description="External Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_EXTR" sequenceId="02" enumTypeId="JOB_POSTING"/>

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
     <description>HumanRes Manager Module of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>HR</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml Tue Aug 16 03:43:06 2011
@@ -47,6 +47,4 @@ under the License.
     <CustomMethodType customMethodTypeId="TASK_FORMULA" description="Formula for calculating time estimates for tasks"/>
     <CustomMethodType customMethodTypeId="BOM_FORMULA" description="Formula for calculating material estimates for boms"/>
 
-    <WebSite webSiteId="MANUFACTURING" siteName="Manufacturing Manager" visualThemeSetId="BACKOFFICE"/>
-
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
     <description>Manufacturing Manager Module by TAU Informatica srl</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>MANUFACTURING</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Tue Aug 16 03:43:06 2011
@@ -98,9 +98,6 @@ under the License.
     <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="LEAD_QUALIFIED" transitionName="Qualified"/>
     <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="PARTY_DISABLED" transitionName="Disabled"/>
 
-    <WebSite webSiteId="MARKETING" siteName="Marketing Manager" visualThemeSetId="BACKOFFICE"/>
-    <WebSite webSiteId="SFA" siteName="SFA Manager" visualThemeSetId="BACKOFFICE"/>
-
     <EnumerationType enumTypeId="SLSOPP_TYP_ENUM" description="Sales Opportunity Type"/>
     
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
   <description>Marketing Manager Module of the Open For Business Project</description>
 
   <context-param>
-      <param-name>webSiteId</param-name>
-      <param-value>MARKETING</param-value>
-      <description>A unique ID used to look up the WebSite entity</description>
-  </context-param>
-  <context-param>
     <param-name>entityDelegatorName</param-name>
     <param-value>default</param-value>
     <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
     <description>SFA Manager Module of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>SFA</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Tue Aug 16 03:43:06 2011
@@ -230,8 +230,6 @@ under the License.
     <StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
     <StatusValidChange condition="" statusId="WERV_APPROVED" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
 
-    <WebSite webSiteId="WORKEFFORT" siteName="Work Effort Manager" visualThemeSetId="BACKOFFICE"/>
-
     <!-- iCalendar Data -->
     <RoleType description="Calendar Member" hasTable="N" parentTypeId="CALENDAR_ROLE" roleTypeId="ICAL_MEMBER"/>
     <ContactMechType contactMechTypeId="LDAP_ADDRESS" parentTypeId="ELECTRONIC_ADDRESS" hasTable="N" description="LDAP URL"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
   <description>iCalendar Server Module of the Open For Business Project</description>
 
   <context-param>
-      <param-name>webSiteId</param-name>
-      <param-value>ICAL</param-value>
-      <description>A unique ID used to look up the WebSite entity</description>
-  </context-param>
-  <context-param>
     <param-name>entityDelegatorName</param-name>
     <param-value>default</param-value>
     <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
   <description>Work Manager Module of the Open For Business Project</description>
 
   <context-param>
-    <param-name>webSiteId</param-name>
-    <param-value>WORKEFFORT</param-value>
-    <description>A unique ID used to look up the WebSite entity</description>
-  </context-param>
-  <context-param>
     <param-name>entityDelegatorName</param-name>
     <param-value>default</param-value>
     <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/framework/bi/data/BiTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/data/BiTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/data/BiTypeData.xml (original)
+++ ofbiz/trunk/framework/bi/data/BiTypeData.xml Tue Aug 16 03:43:06 2011
@@ -19,5 +19,5 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <WebSite webSiteId="BI" siteName="Business Intelligence Application" visualThemeSetId="BACKOFFICE"/>
+
 </entity-engine-xml>

Modified: ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@
     <description>Business Intelligence component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>BI</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Tue Aug 16 03:43:06 2011
@@ -129,8 +129,6 @@ under the License.
     <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/>
     <VisualThemeSet visualThemeSetId="ECOMMERCE"  description="Themes to be used for ECommerce applications"/>
 
-    <WebSite webSiteId="WEBTOOLS" siteName="Web Tools" visualThemeSetId="BACKOFFICE"/>
-
     <!-- Uom Conversion Purposes -->
     <EnumerationType enumTypeId="CONVERSION_PURPOSE" description="Conversion Purpose"/>
     <Enumeration enumId="INTERNAL_CONVERSION" enumTypeId="CONVERSION_PURPOSE" enumCode="INTERNAL" sequenceId="10" description="Internal Conversion"/>

Modified: ofbiz/trunk/framework/example/data/ExampleTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExampleTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/ExampleTypeData.xml (original)
+++ ofbiz/trunk/framework/example/data/ExampleTypeData.xml Tue Aug 16 03:43:06 2011
@@ -18,5 +18,5 @@ specific language governing permissions 
 under the License.
 -->
 <entity-engine-xml>
-    <WebSite webSiteId="EXAMPLE" siteName="Example Application" visualThemeSetId="BACKOFFICE"/>
+
 </entity-engine-xml>

Modified: ofbiz/trunk/framework/example/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/birt/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/example/webapp/birt/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@ under the License.
     <description>BIRT Component of the Open For Business Project</description>
     
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>BIRT</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>localDispatcherName</param-name><param-value>birt</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>    

Modified: ofbiz/trunk/framework/exampleext/webapp/exampleext/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/webapp/exampleext/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/webapp/exampleext/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/exampleext/webapp/exampleext/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@ under the License.
     <description>Extended Example Application of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>EXAMPLEEXT</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>localDispatcherName</param-name><param-value>exampleext</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>

Modified: ofbiz/trunk/framework/resources/templates/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/web.xml (original)
+++ ofbiz/trunk/framework/resources/templates/web.xml Tue Aug 16 03:43:06 2011
@@ -3,11 +3,11 @@
     <display-name>Open For Business - @component-resource-name@ Component</display-name>
     <description>@component-resource-name@ Component of the Open For Business Project</description>
 
-    <context-param>
+    <!-- context-param>
         <param-name>webSiteId</param-name>
         <param-value>@component-name@Site</param-value>
         <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
+    </context-param-->
     <context-param>
         <param-name>localDispatcherName</param-name><param-value>@component-name@</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>

Modified: ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@
     <description>Example Application of the Open For Business Project</description>
     
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>TESTTOOLS</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>localDispatcherName</param-name><param-value>testtools</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>

Modified: ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -21,11 +21,6 @@ under the License.
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
  version="2.4">
- <context-param>
-  <description>A unique ID used to look up the WebSite entity</description>
-  <param-name>webSiteId</param-name>
-  <param-value>WEBTOOLS</param-value>
- </context-param>
   <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
   <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
   <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -25,11 +25,6 @@ under the License.
   <description>Common Application Components of the Open For Business Project</description>
 
   <context-param>
-    <param-name>webSiteId</param-name>
-    <param-value>WEBTOOLS</param-value>
-    <description>A unique ID used to look up the WebSite entity</description>
-  </context-param>
-  <context-param>
     <param-name>entityDelegatorName</param-name>
     <param-value>default</param-value>
     <!--<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>-->

Modified: ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml Tue Aug 16 03:43:06 2011
@@ -18,5 +18,5 @@ specific language governing permissions 
 under the License.
 -->
 <entity-engine-xml>
-    <WebSite webSiteId="ASSETMAINT" siteName="Asset Maintenance Application" visualThemeSetId="BACKOFFICE"/>
+
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@
     <description>Asset Management component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>ASSETMAINT</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@ under the License.
     <description>Google Base component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>GOOGLEBASE</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Aug 16 03:43:06 2011
@@ -155,8 +155,6 @@
     <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/>
     <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>
 
-    <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/>
-    
     <!-- Myportal help pages -->
     <DataResource dataResourceId="HELP_MYPORTAL" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
       objectInfo="specialpurpose/myportal/data/helpdata/HELP_MYPORTAL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" 

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@
     <description>My Portal component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>MYPORTAL</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Tue Aug 16 03:43:06 2011
@@ -76,6 +76,4 @@ under the License.
     <!-- for current installations -->
     <StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
 
-    <WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE"/>
-
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -24,11 +24,6 @@
     <description>Project Management component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>PROJECTMGR</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>entityDelegatorName</param-name>
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>

Modified: ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml Tue Aug 16 03:43:06 2011
@@ -80,8 +80,6 @@
     <!-- Party SVN Identification-->
     <PartyIdentificationType partyIdentificationTypeId="SVN_LOGIN" description="SVN login name"/>
     
-    <WebSite webSiteId="scrumSite" siteName="Scrum Manager" visualThemeSetId="BACKOFFICE"/>
-    
     <StatusValidChange statusId="CRQ_REVIEWED" statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/>
     <StatusValidChange statusId="CRQ_CANCELLED" statusIdTo="CRQ_ACCEPTED" transitionName="Re-open Request"/>
     <StatusValidChange statusId="CRQ_COMPLETED" statusIdTo="CRQ_REOPENED" transitionName="Re-open Request"/>

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -5,12 +5,6 @@
 	</description>
 
 	<context-param>
-		<param-name>webSiteId</param-name>
-		<param-value>scrumSite</param-value>
-		<description>A unique ID used to look up the WebSite entity
-		</description>
-	</context-param>
-	<context-param>
 		<param-name>localDispatcherName</param-name>
 		<param-value>scrum</param-value>
 		<description>A unique name used to identify/recognize the local

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml?rev=1158099&r1=1158098&r2=1158099&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml Tue Aug 16 03:43:06 2011
@@ -4,11 +4,6 @@
     <description>scrum Component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>scrumSite</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>localDispatcherName</param-name><param-value>scrum</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>