svn commit: r1750662 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
Author: arunpatidar
Date: Wed Jun 29 15:16:20 2016
New Revision: 1750662
URL: http://svn.apache.org/viewvc?rev=1750662=rev
Log:
Applied patch from jira issue - OFBIZ-7479 - Enforce noninstantiability to
BshUtil class. Thanks Rishi Solanki and Rahul Singh for your contribution.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java?rev=1750662=1750661=1750662=diff
==
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java Wed Jun 29
15:16:20 2016
@@ -44,9 +44,11 @@ public final class BshUtil {
public static final String module = BshUtil.class.getName();
-protected static ConcurrentHashMap
masterClassManagers = new ConcurrentHashMap();
+private static ConcurrentHashMap
masterClassManagers = new ConcurrentHashMap();
private static final UtilCache
parsedScripts = UtilCache.createUtilCache("script.BshLocationParsedCache", 0,
0, false);
+private BshUtil() {}
+
/**
* Evaluate a BSH condition or expression
* @param expression The expression to evaluate
svn commit: r1750661 - /ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
Author: arunpatidar
Date: Wed Jun 29 15:11:54 2016
New Revision: 1750661
URL: http://svn.apache.org/viewvc?rev=1750661=rev
Log:
Applied patch from jira issue - OFBIZ-7474 - Enforce noninstantiability to
ServiceMcaUtil class. Thanks Rishi Solanki and Rohit Koushal for your
contribution.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java?rev=1750661=1750660=1750661=diff
==
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java
Wed Jun 29 15:11:54 2016
@@ -33,11 +33,13 @@ import org.ofbiz.service.GenericServiceE
import org.ofbiz.service.LocalDispatcher;
import org.w3c.dom.Element;
-public class ServiceMcaUtil {
+public final class ServiceMcaUtil {
public static final String module = ServiceMcaUtil.class.getName();
private static final UtilCache mcaCache =
UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false);
+private ServiceMcaUtil() {}
+
public static void reloadConfig() {
mcaCache.clear();
readConfig();
svn commit: r1750659 - /ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
Author: arunpatidar
Date: Wed Jun 29 14:56:33 2016
New Revision: 1750659
URL: http://svn.apache.org/viewvc?rev=1750659=rev
Log:
Applied patch from jira issue - OFBIZ-7470 - Enforce noninstantiability to
WorkEffortWorker class. Thanks Rishi Solanki and Aman Mishra for your
contribution.
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?rev=1750659=1750658=1750659=diff
==
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
Wed Jun 29 14:56:33 2016
@@ -33,10 +33,12 @@ import org.ofbiz.entity.util.EntityQuery
/** WorkEffortWorker - Work Effort worker class. */
-public class WorkEffortWorker {
+public final class WorkEffortWorker {
public static final String module = WorkEffortWorker.class.getName();
+private WorkEffortWorker() {}
+
public static List getLowestLevelWorkEfforts(Delegator
delegator, String workEffortId, String workEffortAssocTypeId) {
return getLowestLevelWorkEfforts(delegator, workEffortId,
workEffortAssocTypeId, "workEffortIdFrom", "workEffortIdTo");
}
svn commit: r1750653 - in /ofbiz/branches/release14.12: ./ specialpurpose/scrum/widget/scrumMenus.xml
Author: arunpatidar Date: Wed Jun 29 14:32:38 2016 New Revision: 1750653 URL: http://svn.apache.org/viewvc?rev=1750653=rev Log: Applied fix from trunk for revision: 1750651 === Applied patch from jira issue - OFBIZ-7262 - Error on closing and re-opening of project. Thanks Anurag Chandak for your patch and Montalbano Florian for verifying patch. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/specialpurpose/scrum/widget/scrumMenus.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 29 14:32:38 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,133,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-160,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750624
svn commit: r1750652 - in /ofbiz/branches/release15.12: ./ specialpurpose/scrum/widget/scrumMenus.xml
Author: arunpatidar Date: Wed Jun 29 14:31:58 2016 New Revision: 1750652 URL: http://svn.apache.org/viewvc?rev=1750652=rev Log: Applied fix from trunk for revision: 1750651 === Applied patch from jira issue - OFBIZ-7262 - Error on closing and re-opening of project. Thanks Anurag Chandak for your patch and Montalbano Florian for verifying patch. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumMenus.xml Propchange: ofbiz/branches/release15.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 29 14:31:58 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228, 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651 Modified: ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumMenus.xml?rev=1750652=1750651=1750652=diff == --- ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumMenus.xml (original) +++ ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumMenus.xml Wed Jun 29 14:31:58 2016 @@ -963,6 +963,7 @@ under the License. + @@ -980,6 +981,7 @@ under the License. +
svn commit: r1750651 - /ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
Author: arunpatidar Date: Wed Jun 29 14:29:19 2016 New Revision: 1750651 URL: http://svn.apache.org/viewvc?rev=1750651=rev Log: Applied patch from jira issue - OFBIZ-7262 - Error on closing and re-opening of project. Thanks Anurag Chandak for your patch and Montalbano Florian for verifying patch. Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml?rev=1750651=1750650=1750651=diff == --- ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Wed Jun 29 14:29:19 2016 @@ -963,6 +963,7 @@ under the License. + @@ -980,6 +981,7 @@ under the License. +
svn commit: r1750648 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
Author: arunpatidar
Date: Wed Jun 29 14:07:41 2016
New Revision: 1750648
URL: http://svn.apache.org/viewvc?rev=1750648=rev
Log:
Applied patch from jira issue - OFBIZ-7466 - Enforce noninstantiability to
ProtectViewWorker Class. Thanks Pratik Kulshreshth for your contribution.
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java?rev=1750648=1750647=1750648=diff
==
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java
Wed Jun 29 14:07:41 2016
@@ -39,7 +39,7 @@ import org.ofbiz.entity.util.EntityQuery
/**
* Common Workers
*/
-public class ProtectViewWorker {
+public final class ProtectViewWorker {
private final static String module = ProtectViewWorker.class.getName();
private static final String resourceWebapp = "WebappUiLabels";
@@ -47,6 +47,8 @@ public class ProtectViewWorker {
private static final Map durationByViewAccessed = new
ConcurrentHashMap();
private static final Long one = new Long(1);
+private ProtectViewWorker () {}
+
/**
* An HTTP WebEvent handler that checks to see if an userLogin should be
tarpitted
* The decision is made in regard of number of hits in last period of time
svn commit: r1750647 [2/4] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/bud
Modified: ofbiz/trunk/applications/order/minilang/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/UpgradeServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/UpgradeServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/order/minilang/customer/CheckoutMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/customer/CheckoutMapProcs.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/customer/CheckoutMapProcs.xml (original) +++ ofbiz/trunk/applications/order/minilang/customer/CheckoutMapProcs.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/order/minilang/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/customer/CustomerEvents.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/minilang/customer/CustomerEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Wed Jun 29 14:06:29 2016 @@ -23,7 +23,7 @@ This file contains basic services for Sa --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/CheckoutServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified:
svn commit: r1750647 [3/4] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/bud
Modified: ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml Wed Jun 29 14:06:29 2016 @@
svn commit: r1750647 [4/4] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/bud
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleCompoundWidgets.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleCompoundWidgets.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/example/widget/example/ExampleCompoundWidgets.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleCompoundWidgets.xml Wed Jun 29 14:06:29 2016 @@ -114,7 +114,7 @@ under the License. - + Modified: ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseEvents.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseEvents.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/minilang/GooglebaseServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/specialpurpose/googlecheckout/minilang/PrepareXMLTemplate.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/minilang/PrepareXMLTemplate.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/googlecheckout/minilang/PrepareXMLTemplate.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/minilang/PrepareXMLTemplate.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/specialpurpose/googlecheckout/minilang/ShoppingCartServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/minilang/ShoppingCartServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/googlecheckout/minilang/ShoppingCartServices.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/minilang/ShoppingCartServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/specialpurpose/hhfacility/minilang/FacilityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/minilang/FacilityServices.xml?rev=1750647=1750646=1750647=diff == --- ofbiz/trunk/specialpurpose/hhfacility/minilang/FacilityServices.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/minilang/FacilityServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd;> +xmlns="http://ofbiz.apache.org/Simple-Method; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd;> Modified: ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml URL:
svn commit: r1750647 [1/4] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/bud
Author: jleroux Date: Wed Jun 29 14:06:29 2016 New Revision: 1750647 URL: http://svn.apache.org/viewvc?rev=1750647=rev Log: A last slightly modified patch from James Yong for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 I have uploaded a patch for the simple methods schema. In general, the top level attributes are converted to simpleType, and attributeGroups to complexType. Changed the following attribute name 1. ‘field’ to ‘fieldType’ 2. ‘level’ to ‘levelType' Denormalize the following attributeGroups 1. attlist.compare 2. attlist.compare-field Left attributeGroup ‘typeDefaultString’ unchanged, cos it doesn’t matter. Not in use, it seem. jleroux: we also fixed an issue with to In the patch And I found a small issue (not minilang related) in ExampleCompoundWidgets.xml - + Removed: ofbiz/trunk/framework/minilang/dtd/simple-methods-ns.xsd Modified: ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountGlPostServices.xml ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceEvents.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentGatewayConfigServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentMapProcs.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodEvents.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.xml ofbiz/trunk/applications/accounting/minilang/permissions/PermissionServices.xml ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml ofbiz/trunk/applications/accounting/minilang/test/AutoPaymentTests.xml ofbiz/trunk/applications/accounting/minilang/test/FixedAssetTests.xml ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml ofbiz/trunk/applications/content/minilang/ContentManagementMapProcessors.xml ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/content/minilang/data/DataServices.xml ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml ofbiz/trunk/applications/content/minilang/permission/DataResourcePermissionServices.xml ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml ofbiz/trunk/applications/humanres/minilang/permission/HumanResPermissionServices.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomFormulas.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomMapProcs.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunSimpleEvents.xml
svn commit: r1750628 - in /ofbiz/branches/release13.07: ./ applications/content/src/org/ofbiz/content/ContentManagementServices.java applications/content/widget/forum/ForumForms.xml
Author: pranayp Date: Wed Jun 29 12:48:05 2016 New Revision: 1750628 URL: http://svn.apache.org/viewvc?rev=1750628=rev Log: Applied fix from trunk for revision: 1750624 === [OFBIZ-7554] Fixed issues with Forum Screens Delete and Update buttons. Issues fixed are: - Forum list on Forum Group View -- Delete button is not showing up and working. -- Update button is not working. - Forum Group Roles -- Delete button is not showing up and working. - Messages for Forum View -- Delete button is not showing up and working. -- Update button is not working. Thanks Mohammed Rehan Khan for reporting the issue and providing the patch. Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/ContentManagementServices.java ofbiz/branches/release13.07/applications/content/widget/forum/ForumForms.xml Propchange: ofbiz/branches/release13.07/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 29 12:48:05 2016 @@ -6,4 +6,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 /ofbiz/branches/release15.12:1745714 -/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,151,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1534062,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,154,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311, 1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,16121 90,1612202,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626425,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,16
