svn commit: r1706593 - in /ofbiz/trunk: ./ applications/content/config/ applications/content/data/ applications/order/data/ applications/order/widget/ordermgr/ applications/product/config/ applications/product/data/helpdata/ framework/common/config/ fr...

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

svn commit: r1706593 - in /ofbiz/trunk: ./ applications/content/config/ applications/content/data/ applications/order/data/ applications/order/widget/ordermgr/ applications/product/config/ applications/product/data/helpdata/ framework/common/config/ fr...

Arun Patidar-4
Author: arunpatidar
Date: Sat Oct  3 14:31:12 2015
New Revision: 1706593

URL: http://svn.apache.org/viewvc?rev=1706593&view=rev
Log:
[OFBIZ-6171] Replacing 'Open for Business' references with 'Apache OFBiz'from remaining occurences.

Modified:
    ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
    ofbiz/trunk/applications/content/data/DataCategoryData.xml
    ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml
    ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Features.xml
    ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml
    ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml
    ofbiz/trunk/framework/start/build.xml
    ofbiz/trunk/framework/start/pom.xml
    ofbiz/trunk/macros.xml
    ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl
    ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/error/error.jsp
    ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/solr/webapp/solr/error/error.jsp
    ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js
    ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css
    ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css
    ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css
    ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/js/application.js
    ofbiz/trunk/themes/tomahawk/includes/header.ftl
    ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css
    ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/help.css

Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentEntityLabels.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentEntityLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentEntityLabels.xml Sat Oct  3 14:31:12 2015
@@ -1637,7 +1637,7 @@
         <value xml:lang="th">ระบบปฏิบัติการลีนุกซ์</value>
     </property>
     <property key="DataCategory.categoryName.TECH_SOFT_OFBIZ">
-        <value xml:lang="en">Open for Business</value>
+        <value xml:lang="en">Apache OFBiz</value>
         <value xml:lang="ja">OFBiz</value>
         <value xml:lang="th">เปิดสำหรับทางธุรกิจ</value>
         <value xml:lang="zh">OFBiz</value>

Modified: ofbiz/trunk/applications/content/data/DataCategoryData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DataCategoryData.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/DataCategoryData.xml (original)
+++ ofbiz/trunk/applications/content/data/DataCategoryData.xml Sat Oct  3 14:31:12 2015
@@ -29,7 +29,7 @@ under the License.
     <DataCategory dataCategoryId="BUS_SERVICE" parentCategoryId="BUSINESS" categoryName="Service"/>
     <DataCategory dataCategoryId="BUS_MANU" parentCategoryId="BUSINESS" categoryName="Manufacturing"/>
     <DataCategory dataCategoryId="TECH_SOFT" parentCategoryId="TECHNOLOGY" categoryName="Software"/>
-    <DataCategory dataCategoryId="TECH_SOFT_OFBIZ" parentCategoryId="TECH_SOFT" categoryName="Open for Business"/>
+    <DataCategory dataCategoryId="TECH_SOFT_OFBIZ" parentCategoryId="TECH_SOFT" categoryName="Apache OFBiz"/>
     <DataCategory dataCategoryId="TECH_SOFT_LINUX" parentCategoryId="TECH_SOFT" categoryName="Linux"/>
     <DataCategory dataCategoryId="TECH_SOFT_JAVA" parentCategoryId="TECH_SOFT" categoryName="Java"/>
     <DataCategory dataCategoryId="TECH_HARD" parentCategoryId="TECHNOLOGY" categoryName="Hardware"/>

Modified: ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml (original)
+++ ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml Sat Oct  3 14:31:12 2015
@@ -23,11 +23,11 @@ under the License.
     <Facility facilityId="WebStoreWarehouse"/>
     
     <!-- PRODUCT STORE -->
-    <ProductStore productStoreId="B2CStore" storeName="OFBiz the B2C Store" companyName="Open For Business" autoApproveReviews="Y" title="Open For Business to Customer"
+    <ProductStore productStoreId="B2CStore" storeName="OFBiz the B2C Store" companyName="Apache OFBiz" autoApproveReviews="Y" title="Apache OFBiz to Customer"
         subtitle="" prorateShipping="Y" prorateTaxes="Y" defaultLocaleString="en_US" defaultCurrencyUomId="USD"
         autoApproveInvoice="Y" autoApproveOrder="Y" shipIfCaptureFails="Y" requireInventory="N" reserveInventory="Y" inventoryFacilityId="WebStoreWarehouse"
         orderNumberPrefix="B2CS" visualThemeId="EC_DEFAULT" payToPartyId="Company" defaultSalesChannelEnumId="WEB_SALES_CHANNEL"/>
-    <ProductStore productStoreId="B2BStore" storeName="OFBiz the B2B Store" companyName="Open For Business" autoApproveReviews="Y" title="Open For Business to Business"
+    <ProductStore productStoreId="B2BStore" storeName="OFBiz the B2B Store" companyName="Apache OFBiz" autoApproveReviews="Y" title="Apache OFBiz to Business"
         subtitle="" prorateShipping="Y" prorateTaxes="Y" defaultLocaleString="en_US" defaultCurrencyUomId="USD"
         autoApproveInvoice="Y" autoApproveOrder="Y" shipIfCaptureFails="Y" requireInventory="N" reserveInventory="Y" inventoryFacilityId="WebStoreWarehouse"
         orderNumberPrefix="B2BS" visualThemeId="EC_DEFAULT" payToPartyId="Company" defaultSalesChannelEnumId="WEB_SALES_CHANNEL"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Oct  3 14:31:12 2015
@@ -29,8 +29,8 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId">
-            <drop-down allow-empty="true" allow-multiple="true">
-                <entity-options entity-name="StatusItem">
+            <drop-down allow-multiple="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Sat Oct  3 14:31:12 2015
@@ -4328,7 +4328,7 @@
     </property>
     <property key="FieldDescription.ProductStore.itemApprovedStatus">
         <value xml:lang="de">Auf welchen Status sollen Bestellpositionen gesetzt werden, wenn Bestellungen freigegeben, abgelehnt oder storniert werden. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value>
-        <value xml:lang="en">What to set order items status to when orders are approved, declined, or canceled. Based on the standard defined status codes in Open for Business.</value>
+        <value xml:lang="en">What to set order items status to when orders are approved, declined, or canceled. Based on the standard defined status codes in Apache OFBiz.</value>
         <value xml:lang="ja">注文が承認、否認、または取消された時に、注文アイテムステータスに何を設定しますか。OFBizで標準定義されたステータスコードに基づきます。</value>
         <value xml:lang="vi">Để thiết lập trật tá»± các mục tình trạng khi đơn đặt hàng được phê duyệt , từ chối hoặc há»§y bỏ. Dá»±a trên mã trạng thái quy định tiêu chuẩn mở cho doanh nghiệp.</value>
         <value xml:lang="zh">当订单被批准、被拒绝或被取消时,把订单明细设置成什么状态。基于OFBiz中定义的标准状态代码。</value>
@@ -4336,7 +4336,7 @@
     </property>
     <property key="FieldDescription.ProductStore.digitalItemApprovedStatus">
         <value xml:lang="de">Auf welchen Status sollen Bestellpositionen gesetzt werden, wenn digitale Bestellungen freigegeben, abgelehnt oder storniert werden. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value>
-        <value xml:lang="en">What to set order items status to when Digital Item orders are approved, declined, or canceled. Based on the standard defined status codes in Open for Business.</value>
+        <value xml:lang="en">What to set order items status to when Digital Item orders are approved, declined, or canceled. Based on the standard defined status codes in Apache OFBiz.</value>
         <value xml:lang="ja">デジタル商品の注文が承認、否認、または取消された時に、注文アイテムステータスに何を設定しますか。OFBizで標準定義されたステータスコードに基づきます。</value>
         <value xml:lang="vi">Để thiết lập trật tá»± các mục tình trạng khi các đơn đặt hàng mục kỹ thuật số được phê duyệt , từ chối hoặc há»§y bỏ. Dá»±a trên các mã trạng thái quy định tiêu chuẩn mở cho doanh nghiệp.</value>
         <value xml:lang="zh">当数字产品明细订单被批准、被拒绝或被取消时,把订单明细设置成什么状态。基于OFBiz中定义的标准状态代码。</value>
@@ -4344,7 +4344,7 @@
     </property>
     <property key="FieldDescription.ProductStore.headerDeclinedStatus">
         <value xml:lang="de">Dies ist die Statusnachricht die Ihre Kunden sehen sollen, wenn ihre Bestellung abgelehnt wurde. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value>
-        <value xml:lang="en">This is the message you want your customers to see when their order is declined. Based on the standard defined status codes in Open for Business.</value>
+        <value xml:lang="en">This is the message you want your customers to see when their order is declined. Based on the standard defined status codes in Apache OFBiz.</value>
         <value xml:lang="ja">注文が否認された時に顧客に見せたいメッセージを指定します。OFBizで標準定義されたステータスコードに基づきます。</value>
         <value xml:lang="vi">Tin nhắn mà bạn muốn khách hàng cá»§a bạn nhìn thấy khi đặt hàng cá»§a họ bị từ chối. Dá»±a trên các mã trạng thái quy định tiêu chuẩn mở cho doanh nghiệp.</value>
         <value xml:lang="zh">当客户的订单被拒绝时,这是你想要他们看到的信息。基于OFBiz中定义的标准状态代码。</value>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Oct  3 14:31:12 2015
@@ -119,12 +119,12 @@
         <value xml:lang="zh-TW">OFBiz:場所管理程式</value>
     </property>
     <property key="FacilityCompanySubtitle">
-        <value xml:lang="de">Teil der Open For Business Familie von Open Source Software</value>
-        <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
-        <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
-        <value xml:lang="it">Un modulo della famiglia di software open source Open For Business</value>
-        <value xml:lang="ja">Part of the Open For Business Family of Open Source Software</value>
-        <value xml:lang="nl">Deel van de 'Open For Business' familie van open source software</value>
+        <value xml:lang="de">Teil der Apache OFBiz Familie von Open Source Software</value>
+        <value xml:lang="en">Part of the Apache OFBiz Family of Open Source Software</value>
+        <value xml:lang="fr">Un module de la famille Apache OFBiz, logiciel libre de gestion d'entreprise.</value>
+        <value xml:lang="it">Un modulo della famiglia di software open source Apache OFBiz</value>
+        <value xml:lang="ja">Part of the Apache OFBiz Family of Open Source Software</value>
+        <value xml:lang="nl">Deel van de 'Apache OFBiz' familie van open source software</value>
         <value xml:lang="vi">Một phần cá»§a Đại gia đình phần mềm mã mở dành cho kinh doanh</value>
         <value xml:lang="zh">开源软件OFBiz的组成部分</value>
         <value xml:lang="zh-TW">開源軟體OFBiz的組成部分</value>

Modified: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml (original)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml Sat Oct  3 14:31:12 2015
@@ -39,7 +39,7 @@
     </section>
     <section>
         <title> Promo tab</title>
-        <para>At the top is general information about this promotion. Each promotion has an ID, a name and a longer descriptive text, which are shown to customers. If no text is entered, Open for Business will automatically generate text for you.
+        <para>At the top is general information about this promotion. Each promotion has an ID, a name and a longer descriptive text, which are shown to customers. If no text is entered, Apache OFBiz will automatically generate text for you.
 </para>
     </section>
     <note>

Modified: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Features.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Features.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Features.xml (original)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Features.xml Sat Oct  3 14:31:12 2015
@@ -21,7 +21,7 @@
     <title>Catalog Features overview </title>
     <anchor xml:id="ProductCatalogFeatures"/>
     <para>To Sell and to Differentiate Products
-Features are characteristics used to sell and to differentiate products. The Open for Business catalog manager allows you to define any feature set you wish for your products. Typical features include size and color. In Open for Business, features are associated, or applied, to products as Standard Features, Selectable Features, or Distinguishing Features.
+Features are characteristics used to sell and to differentiate products. The Apache OFBiz catalog manager allows you to define any feature set you wish for your products. Typical features include size and color. In Apache OFBiz, features are associated, or applied, to products as Standard Features, Selectable Features, or Distinguishing Features.
 </para>
 
 

Modified: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product%20Stores.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml (original)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml Sat Oct  3 14:31:12 2015
@@ -67,7 +67,7 @@ Stores tab (with a store selected) bring
 </section>
 <section>
     <title> Why use stores?</title>
- <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Open for business applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry and POS applications. They could even be in different countries with different shipping and taxation rules.
+ <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Apache OFBiz applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry and POS applications. They could even be in different countries with different shipping and taxation rules.
 </para>
 </section>
 <section>
@@ -104,7 +104,7 @@ NOTE: It is possible for a web applicati
 </section>
 <section>
     <title>Payments</title>
-<para>his is used to set up payment processing for the store. The payment processing interfaces are defined as Open for business services. Each payment method will have a series of service types available to it, such as for authorizing, capturing, and refunding payment. This page links the payment types and the services together by their purpose. Thus, one service would be used for credit card authorizations, another for credit card capture, and so forth
+<para>his is used to set up payment processing for the store. The payment processing interfaces are defined as Apache OFBiz services. Each payment method will have a series of service types available to it, such as for authorizing, capturing, and refunding payment. This page links the payment types and the services together by their purpose. Thus, one service would be used for credit card authorizations, another for credit card capture, and so forth
 </para>
 </section>
 <section>

Modified: ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml Sat Oct  3 14:31:12 2015
@@ -34,11 +34,11 @@
         <value xml:lang="zh-TW">說明主題沒有找到.</value>
     </property>
     <property key="PageTitleHelp">
-        <value xml:lang="da">Open for Business hjælp</value>
-        <value xml:lang="de">Open for Business Hilfe</value>
-        <value xml:lang="en">Open for Business Help</value>
-        <value xml:lang="es">Ayuda de Open for Business</value>
-        <value xml:lang="fr">Aide OFBiz (Open for Business)</value>
+        <value xml:lang="da">Apache OFBiz hjælp</value>
+        <value xml:lang="de">Apache OFBiz Hilfe</value>
+        <value xml:lang="en">Apache OFBiz Help</value>
+        <value xml:lang="es">Ayuda de Apache OFBiz</value>
+        <value xml:lang="fr">Aide OFBiz (Apache OFBiz)</value>
         <value xml:lang="it">Aiuto</value>
         <value xml:lang="ja">OFBizヘルプ</value>
         <value xml:lang="pt-BR">Ajuda do OFBiz</value>

Modified: ofbiz/trunk/framework/start/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/build.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/build.xml (original)
+++ ofbiz/trunk/framework/start/build.xml Sat Oct  3 14:31:12 2015
@@ -43,7 +43,7 @@ under the License.
                 <manifest>
                     <attribute name="Manifest-Version" value="1.0"/>
                     <attribute name="Implementation-Title" value="Apache OFBiz Startup"/>
-                    <attribute name="Implementation-Vendor" value="The Apache Open for Business Project"/>
+                    <attribute name="Implementation-Vendor" value="The Apache Apache OFBiz Project"/>
                     <attribute name="Main-Class" value="org.ofbiz.base.start.Start"/>
                 </manifest>
             </main-elements>

Modified: ofbiz/trunk/framework/start/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/pom.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/pom.xml (original)
+++ ofbiz/trunk/framework/start/pom.xml Sat Oct  3 14:31:12 2015
@@ -39,7 +39,7 @@ under the License.
             <manifestEntries>
               <Manifest-Version>1.0</Manifest-Version>
               <Implementation-Title>Apache OFBiz Startup</Implementation-Title>
-              <Implementation-Vendor>The Apache Open for Business Project</Implementation-Vendor>
+              <Implementation-Vendor>The Apache Apache OFBiz Project</Implementation-Vendor>
               <Main-Class>org.ofbiz.base.start.Start</Main-Class>
             </manifestEntries>
           </archive>

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sat Oct  3 14:31:12 2015
@@ -84,7 +84,7 @@ under the License.
  <presetdef name="default-javadoc">
     <javadoc classpathref="local.class.path"
              destdir="${build.dir}/javadocs"
-             windowtitle="Apache Open for Business - ${desc}"
+             windowtitle="Apache OFBiz - ${desc}"
              useexternalfile="yes"
              maxmemory="512M"
              encoding="UTF-8"

Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl Sat Oct  3 14:31:12 2015
@@ -147,7 +147,7 @@ under the License.
             <p>2007-02-22 &quot;<a href="http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9011649" target="_blank">More midmarket firms choose open-source ERP</a>&quot; on <a href="http://www.computerworld.com/" target="_blank">ComputerWorld</a></p>
             <p>2006-12-06 &quot;<a href="http://feathercast.org/?p=37" target="_blank">Feathercast Episode 22: OFBiz</a>&quot; on <a href="http://feathercast.org/" target="_blank">FeatherCast</a></p>
 
-            <p>2006-11-30 &quot;<a href="http://www.linuxworld.com/podcasts/linux/ean_schuessler_on_apache_open.html" target="_blank">LinuxWorld LinuxCast: Ean Schuessler on Apache Open For Business</a>&quot; on <a href="http://www.linuxworld.com/" target="_blank">LinuxWorld</a></p>
+            <p>2006-11-30 &quot;<a href="http://www.linuxworld.com/podcasts/linux/ean_schuessler_on_apache_open.html" target="_blank">LinuxWorld LinuxCast: Ean Schuessler on Apache Apache OFBiz</a>&quot; on <a href="http://www.linuxworld.com/" target="_blank">LinuxWorld</a></p>
             <p>2006-10-25 &quot;<a href="http://www.sema.org/main/semaorghome.aspx?id=56095" target="_blank">SEMA Technology: Open Source Explained</a>&quot; on <a href="http://www.sema.org/main/semaorghome.aspx?ID=/content/SEMAorg/HomePage" target="_blank">SEMA.org</a></p>
             <p>2006-10-02 &quot;<a href="http://joss4biz.interition.net/roller/page/joss4biz/20061002" target="_blank">JOSS4BIZ Episode 5 - David E Jones and Apache OfBiz</a>&quot; on <a href="http://joss4biz.interition.net/" target="_blank">JOSS4BIZ Podcast</a></p>
 
@@ -233,9 +233,9 @@ under the License.
         <p>2005-06-16 &quot;<a href="http://searchenterpriselinux.techtarget.com/originalContent/0,289142,sid39_gci1098875,00.html" target="_blank">SMBs no longer shut out of ERP</a>&quot; on <a href="http://searchenterpriselinux.techtarget.com/" target="_blank">SearchEnterpriseLinux.com</a></p>
 
         <!--p>2005-01-26 &quot;<a href="http://newsvac.newsforge.com/article.pl?sid=05/01/26/1648214" target="_blank">ObjectWeb announces Winners of Best Use Cases Award</a>&quot; on <a href="http://www.newsforge.com/" target="_blank">NewsForge</a></p-->
-        <p>2004-09-11 &quot;<a href="http://www.cio.com.au/index.php?id=318248421" target="_blank">Open For Business</a>&quot; on <a href="http://www.cio.com.au/index.php" target="_blank">CIO Australia</a></p>
-        <p>2004-09-07 &quot;<a href="http://www.technology-evaluation.com/Research/ResearchHighlights/FreeOpenSource/2004/09/research_notes/prn_VN_FS_JC_09_07_04_1.asp" target="_blank">TEC Talks to the Open For Business Project - Free and Open Source Software Business Models Part One: OFBiz</a>&quot; on <a href="http://www.technology-evaluation.com/" target="_blank">Technology Evaluation Centers</a></p>
-        <p>2004-06-01 &quot;<a href="http://today.java.net/pub/a/today/2004/06/01/ofbiz.html" target="_blank">java.net Success Story: Open For Business</a>&quot; on <a href="http://www.java.net/" target="_blank">java.net</a></p>
+        <p>2004-09-11 &quot;<a href="http://www.cio.com.au/index.php?id=318248421" target="_blank">Apache OFBiz</a>&quot; on <a href="http://www.cio.com.au/index.php" target="_blank">CIO Australia</a></p>
+        <p>2004-09-07 &quot;<a href="http://www.technology-evaluation.com/Research/ResearchHighlights/FreeOpenSource/2004/09/research_notes/prn_VN_FS_JC_09_07_04_1.asp" target="_blank">TEC Talks to the Apache OFBiz Project - Free and Open Source Software Business Models Part One: OFBiz</a>&quot; on <a href="http://www.technology-evaluation.com/" target="_blank">Technology Evaluation Centers</a></p>
+        <p>2004-06-01 &quot;<a href="http://today.java.net/pub/a/today/2004/06/01/ofbiz.html" target="_blank">java.net Success Story: Apache OFBiz</a>&quot; on <a href="http://www.java.net/" target="_blank">java.net</a></p>
 
         <p>2004-03-10 &quot;<a href="http://www.ecsforum.org/ecsforum.asp?page=AnnualConf2004" target="_blank">The Open Source Alternative for Direct Commerce (presentation)</a>&quot; on <a href="http://www.ecsforum.org/home.asp" target="_blank">eCSForum</a></p>
         <p>2003-06-01 &quot;<a href="http://www.connect-utah.com/article.asp?r=39&amp;iid=4&amp;sid=1" target="_blank">A New Business Model for Web Services</a>&quot; on <a href="http://www.connect-utah.com/" target="_blank">Connect Magazine</a></p>

Modified: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/error/error.jsp?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/error/error.jsp (original)
+++ ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/error/error.jsp Sat Oct  3 14:31:12 2015
@@ -19,7 +19,7 @@ under the License.
 <%@ page import="org.ofbiz.base.util.*" %>
 <html>
 <head>
-<title>Open For Business Message</title>
+<title>Apache OFBiz Message</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml Sat Oct  3 14:31:12 2015
@@ -17,8 +17,8 @@
 -->
 <web-app>
 
-    <display-name>Open For Business - Solr Component</display-name>
-    <description>Solr Component of the Open For Business Project</description>
+    <display-name>Apache OFBiz - Solr Component</display-name>
+    <description>Solr Component of the Apache OFBiz Project</description>
 
     <context-param>
         <param-name>entityDelegatorName</param-name>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/error/error.jsp?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/error/error.jsp (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/error/error.jsp Sat Oct  3 14:31:12 2015
@@ -19,7 +19,7 @@ under the License.
 <%@ page import="org.ofbiz.base.util.*" %>
 <html>
 <head>
-<title>Open For Business Message</title>
+<title>Apache OFBiz Message</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 

Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/docbook.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/js/application.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/js/application.js?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/js/application.js (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/js/application.js Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBiz
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Sat Oct  3 14:31:12 2015
@@ -121,7 +121,7 @@ under the License.
             <#if organizationLogoLinkURL?has_content>
                 <li id="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li>
                 <#else>
-                <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"></a></li>
+                <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings}"></a></li>
             </#if>
           </#if>
           <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">

Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information

Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/help.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/help.css?rev=1706593&r1=1706592&r2=1706593&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/help.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/help.css Sat Oct  3 14:31:12 2015
@@ -1,5 +1,5 @@
 /***********************************************
-APACHE OPEN FOR BUSINESS
+APACHE OFBIZ
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information