OFBiz › OFBiz - Commits
Login  Register

svn commit: r446858 - in /incubator/ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/ applications/content/webapp/content/WEB-INF/ applications/ecommerce/webapp/ecommerce/WEB-INF/ applications/manufacturing/webapp/manufacturing/WEB-INF/ a...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options Options
 
Embed post
Permalink
jacopoc
Reply | Threaded
Open this post in threaded view
♦
♦
| More
Print post
Permalink
Sep 16, 2006; 1:04pm

svn commit: r446858 - in /incubator/ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/ applications/content/webapp/content/WEB-INF/ applications/ecommerce/webapp/ecommerce/WEB-INF/ applications/manufacturing/webapp/manufacturing/WEB-INF/ a...

jacopoc
3874 posts
Author: jacopoc
Date: Sat Sep 16 05:04:10 2006
New Revision: 446858

URL: http://svn.apache.org/viewvc?view=rev&rev=446858
Log:
Applied patch from Scott Gray to clean up the last (hopefully) Copyright issues.

Modified:
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
    incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl
    incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml
    incubator/ofbiz/trunk/framework/shark/webapp/shark/includes/footer.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl
    incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -20,7 +20,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Accounting Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2002</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
     
     <!-- event handlers -->

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -18,7 +18,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Content Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2002-2006</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
     
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>OFBiz: eCommerce Controller Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2001-2005</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Manufacturing Component Site Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2003</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
     
     <!-- event handlers -->

Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Marketing Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2002</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
     
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Order Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project (c) 2001 </owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <!-- event handlers -->

Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Party Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project (c) 2001 </owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Catalog Module Site Configuration File</description>
-    <owner>The Open For Business Project (c) 2001-2004</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Facility Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project Copyright (c) 2002</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -19,7 +19,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Work Manager Module Site Configuration File</description>
-    <owner>The Open For Business Project (c) 2001 </owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl Sat Sep 16 05:04:10 2006
@@ -52,13 +52,16 @@
           <td align="left" width="1%"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></td>
           </#if>      
           <td align="right" width="1%" nowrap="nowrap" <#if layoutSettings.headerRightBackgroundUrl?has_content>background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
+            <div class="insideHeaderText">
+            <#if userLogin?exists>${uiLabelMap.CommonUsername}:&nbsp;${userLogin.userLoginId?if_exists}&nbsp;</#if>
             <#if person?has_content>
-              <div class="insideHeaderText">${uiLabelMap.CommonWelcome}&nbsp;${person.firstName?if_exists}&nbsp;${person.lastName?if_exists}!</div>
+              ${person.firstName?if_exists}&nbsp;${person.lastName?if_exists}
             <#elseif partyGroup?has_content>
-              <div class="insideHeaderText">${uiLabelMap.CommonWelcome}&nbsp;${partyGroup.groupName?if_exists}!</div>
+              ${partyGroup.groupName?if_exists}
             <#else>
-              <div class="insideHeaderText">${uiLabelMap.CommonWelcome}!</div>
+              ${uiLabelMap.CommonWelcome}!
             </#if>
+            </div>
             <div class="insideHeaderText">&nbsp;${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</div>
             <div class="insideHeaderText">
                 <form method="post" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">

Modified: incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -18,7 +18,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>Shark Workflow Manager Component Site Configuration File</description>
-    <owner>Copyright 2004-2006 The Apache Software Foundation</owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
     
     <!-- event handlers -->

Modified: incubator/ofbiz/trunk/framework/shark/webapp/shark/includes/footer.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/shark/webapp/shark/includes/footer.ftl?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/shark/webapp/shark/includes/footer.ftl (original)
+++ incubator/ofbiz/trunk/framework/shark/webapp/shark/includes/footer.ftl Sat Sep 16 05:04:10 2006
@@ -15,7 +15,6 @@
 -->
 <br/><br/>
 <div class="tabletext" align="center">
-  <div class="tabletext">(c) 2004 The Open For Business Project - <a href="http://www.ofbiz.org" class="tabletext" target="_blank">www.ofbiz.org</a></div>
   <div class="tabletext">Powered By <a href="http://www.ofbiz.org" class="tabletext" target="_blank">OFBiz</a></div>
 </div>
 <br/>

Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat Sep 16 05:04:10 2006
@@ -18,7 +18,7 @@
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/site-conf.xsd">
     <description>WebTools Site Configuration File</description>
-    <owner>The Open For Business Project (c) 2001 </owner>
+    <owner>Copyright 2001-2006 The Apache Software Foundation</owner>
     <errorpage>/error/error.jsp</errorpage>
 
     <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>

Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/footer.ftl Sat Sep 16 05:04:10 2006
@@ -15,7 +15,6 @@
 -->
 <br/><br/>
 <div class="tabletext" align="center">
-  <div class="tabletext">(c) 2004 The Open For Business Project - <a href="http://www.ofbiz.org" class="tabletext" target="_blank">www.ofbiz.org</a></div>
   <div class="tabletext">Powered By <a href="http://www.ofbiz.org" class="tabletext" target="_blank">OFBiz</a></div>
 </div>
 <br/>

Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java?view=diff&rev=446858&r1=446857&r2=446858
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java Sat Sep 16 05:04:10 2006
@@ -87,6 +87,8 @@
         */
         // read the XSL-FO XML Document
         Document xslfo = null;
+Debug.log("DOCUMENTO");
+Debug.log("" + writer.toString());
         try {
             xslfo = UtilXml.readXmlDocument(writer.toString());
         } catch (Throwable t) {


Free forum by Nabble Edit this page