You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2015/04/27 01:44:19 UTC
svn commit: r1676158 - in /ofbiz/branches/OFBIZ-6271: ./
applications/accounting/lib/ applications/content/lib/uno/
applications/order/script/org/ofbiz/order/customer/
applications/order/src/org/ofbiz/order/finaccount/
applications/party/webapp/partymg...
Author: doogie
Date: Sun Apr 26 23:44:18 2015
New Revision: 1676158
URL: http://svn.apache.org/r1676158
Log:
Add in missing license headers.
cherry-picked from 1676155
Modified:
ofbiz/branches/OFBIZ-6271/ (props changed)
ofbiz/branches/OFBIZ-6271/applications/accounting/lib/README
ofbiz/branches/OFBIZ-6271/applications/content/lib/uno/README
ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (props changed)
ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat (props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh (props changed)
Propchange: ofbiz/branches/OFBIZ-6271/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1675958,1676154
+/ofbiz/trunk:1675958,1676154-1676155
Modified: ofbiz/branches/OFBIZ-6271/applications/accounting/lib/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/accounting/lib/README?rev=1676158&r1=1676157&r2=1676158&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/applications/accounting/lib/README (original)
+++ ofbiz/branches/OFBIZ-6271/applications/accounting/lib/README Sun Apr 26 23:44:18 2015
@@ -1,3 +1,22 @@
+#####################################################################
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################
+
To use the cybersource or worldpay or securepay libraries you can copy them to this directory.
See the ofbiz/OPTIONAL_LIBRARIES file for more information.
Modified: ofbiz/branches/OFBIZ-6271/applications/content/lib/uno/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/content/lib/uno/README?rev=1676158&r1=1676157&r2=1676158&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/applications/content/lib/uno/README (original)
+++ ofbiz/branches/OFBIZ-6271/applications/content/lib/uno/README Sun Apr 26 23:44:18 2015
@@ -1,3 +1,21 @@
+#####################################################################
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################
The OpenOffice UNO jars can go here.
Propchange: ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1675958,1676154
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -6,4 +6,4 @@
/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:952958-1044489
/ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1634077-1635900
/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:921280-927264
-/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1675958,1676154
+/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1675958,1676154
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1675958,1676154
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
/ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1675958,1676154
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
/ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
-/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1675958,1676154
+/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:1675958,1676154
+/ofbiz/trunk/specialpurpose/ebaystore/lib:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1675958,1676154
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1675958,1676154
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1675958,1676154
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -4,4 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.bat:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.bat:921280-927264
/ofbiz/trunk/mergefromtrunk.bat:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
-/ofbiz/trunk/tools/mergefromtrunk.bat:1675958,1676154
+/ofbiz/trunk/tools/mergefromtrunk.bat:1675958,1676154-1676155
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 23:44:18 2015
@@ -4,4 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.sh:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.sh:921280-927264
/ofbiz/trunk/mergefromtrunk.sh:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
-/ofbiz/trunk/tools/mergefromtrunk.sh:1675958,1676154
+/ofbiz/trunk/tools/mergefromtrunk.sh:1675958,1676154-1676155