svn commit: r1664244 - /ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jleroux
Date: Thu Mar 5 07:51:28 2015
New Revision: 1664244
URL: http://svn.apache.org/r1664244
Log:
Fix a bug, after r1624700 this has changed in trunk from where I backported
r1663979
Modified:
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Modified:
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1664244r1=1664243r2=1664244view=diff
==
---
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
(original)
+++
ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Thu Mar 5 07:51:28 2015
@@ -40,8 +40,8 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
+import org.ofbiz.base.container.ClassLoaderContainer;
import org.ofbiz.base.location.FlexibleLocation;
-import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.UtilProperties;
@@ -85,7 +85,7 @@ public class ApacheFopWorker {
fopFactory.setUserConfig(userConfigFile);
URL baseUrl = new URL(fopFactory.getBaseURL());
Integer baseport = baseUrl.getPort();
-Integer port = baseport +
Start.getInstance().getConfig().portOffset;
+Integer port = baseport +
ClassLoaderContainer.portOffset;
fopFactory.setBaseURL(http://localhost:; + port);
} else {
Debug.logWarning(FOP configuration file not found:
+ userConfigFile, module);
svn commit: r1663915 - in /ofbiz/branches/release13.07: ./ applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Author: jleroux Date: Wed Mar 4 10:03:48 2015 New Revision: 1663915 URL: http://svn.apache.org/r1663915 Log: Applied fix from trunk for revision: 1663912 r1663912 | jleroux | 2015-03-04 11:02:44 +0100 (mer., 04 mars 2015) | 7 lines A patch from Christian Carlow for Error when updating shipment destinationFacilityId https://issues.apache.org/jira/browse/OFBIZ-6131 The Following Errors Occurred: Error running the simple-method: Primary key map estimatedArrivalWorkEffortMap not found Method = updateShipment, File = file:/home/anon/ofbiz/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml, Element = find-by-primary-key, Line 215null estimatedArrivalWorkEffortMap is passed to find-by-primary-key but never set which causes the error. jleroux: I was curious about this (was weird), it was missed at r889656, anyway gone... Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Propchange: ofbiz/branches/release13.07/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 4 10:03:48 2015 @@ -5,4 +5,4 @@ /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 -/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,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,1612190,16122 02,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,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,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500
svn commit: r1663914 - in /ofbiz/branches/release14.12: ./ applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Author: jleroux Date: Wed Mar 4 10:03:45 2015 New Revision: 1663914 URL: http://svn.apache.org/r1663914 Log: Applied fix from trunk for revision: 1663912 r1663912 | jleroux | 2015-03-04 11:02:44 +0100 (mer., 04 mars 2015) | 7 lines A patch from Christian Carlow for Error when updating shipment destinationFacilityId https://issues.apache.org/jira/browse/OFBIZ-6131 The Following Errors Occurred: Error running the simple-method: Primary key map estimatedArrivalWorkEffortMap not found Method = updateShipment, File = file:/home/anon/ofbiz/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml, Element = find-by-primary-key, Line 215null estimatedArrivalWorkEffortMap is passed to find-by-primary-key but never set which causes the error. jleroux: I was curious about this (was weird), it was missed at r889656, anyway gone... Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 4 10:03:45 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/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 +/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 Modified: ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1663914r1=1663913r2=1663914view=diff == --- ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Mar 4 10:03:45 2015 @@ -212,7 +212,6 @@ under the License. /or /condition then -find-by-primary-key entity-name=WorkEffort map=estimatedArrivalWorkEffortMap value-field=estimatedArrivalWorkEffort/ entity-one entity-name=WorkEffort value-field=estimatedArrivalWorkEffort auto-field-map=false field-map field-name=workEffortId from-field=lookedUpValue.estimatedArrivalWorkEffId/ /entity-one
svn commit: r1663916 - in /ofbiz/branches/release12.04: ./ applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Author: jleroux Date: Wed Mar 4 10:03:51 2015 New Revision: 1663916 URL: http://svn.apache.org/r1663916 Log: Applied fix from trunk for revision: 1663912 r1663912 | jleroux | 2015-03-04 11:02:44 +0100 (mer., 04 mars 2015) | 7 lines A patch from Christian Carlow for Error when updating shipment destinationFacilityId https://issues.apache.org/jira/browse/OFBIZ-6131 The Following Errors Occurred: Error running the simple-method: Primary key map estimatedArrivalWorkEffortMap not found Method = updateShipment, File = file:/home/anon/ofbiz/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml, Element = find-by-primary-key, Line 215null estimatedArrivalWorkEffortMap is passed to find-by-primary-key but never set which causes the error. jleroux: I was curious about this (was weird), it was missed at r889656, anyway gone... Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Propchange: ofbiz/branches/release12.04/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 4 10:03:51 2015 @@ -3,4 +3,4 @@ /ofbiz/branches/jackrabbit20100709:962442-1231517 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:1332097,1333439,1333885,1334201,1334336,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342852,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347559,1347762,1351778,1351999,1353135,1353681,1355660,1355801,1355859,1355975,1358735,1359500,1359599-1359600,1360689,1361056,1361073,1361476,1361662,1361931,1361944,1361958,1364046,1364052,1364216,1364218,130,1366960,1369555,1369561,1377253,1377382,1377386,1377388,1379334,1379340,1379345,1381146,1384251,1384894,1387878,1387884,1388832,1389802,1392773,1393948,1394995,1395104,1395460,1395953,1396105,1399539,1399761,1400388,1400393,1400421,1402766,1403370,1406727,1407634,1408408,1413307,1421662,1422207,1423117,1425155,1425662, 1426231,1426734,1426787,1430332,1430336,1431191,1432392,1432833,1435528,1435701,1438498,1444356,1446575,1446876,1447107,1451183,1451879,1452382,1458429,1459220,1459222,1460116,1460276,1461551,1462948,1463989,1465351,1470151,1470483,1471283-1471284,1471687,1471739,1476296,1480407,1481287,1484279,1485432,1487130,1487854,1488000,1488127,1488188,1489461,1492112,1492673,1493352,1493393,1493658,1493683,1494202,1494682,1497376,1497822,1497839,1499732,1500760,1500772,1502121,1502944,1502946,1504864,1506269,1506499,1506504,1506828,1509164,1510042,1512376,1512573,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1524361,1524676,1524704,1524769,1524950,1525523,1526387,1526463,1527254,1528144,1528146,1528149,1528298,1529412,1529418,1531848,1532342,1532366,1535961,1536656,1537023,1537179,1537996,1538096,1539147,1539156,1543744,1543766,1543781,154,1547548,1548143,1550255,1550515,1551744,1552290,1552500,1552901,1552908,1554290,1554536,1554681,1554685,1554706,1554764,1554787,1555142,15574 09-1557410,1557440,1557447,1557457,1557462,1557593,1558373,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,1571219,1573161,1573498,1573639,1574019,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1579155,1579161,1579309,1580455,1581386,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597464,1598544,1598913,1603732,1603739,1604357,1604363,1604522,1604554,1605348,1605354,1605707,1607457,1608355,1608491,1608495,1608698,1609047,1609065,1609076,1609087,1609167,1609184,1609389,1609394,1609406,1609418,1609885,1610355,1610385,1610425,1610685,1610918,1610925,1611321,1612190,1612205,1613121,1614019,1614025,1614355,16
svn commit: r1663950 - /ofbiz/site/index.html
Author: sharan Date: Wed Mar 4 11:58:00 2015 New Revision: 1663950 URL: http://svn.apache.org/r1663950 Log: remove old news and add ApacheCon NA 2015 details Modified: ofbiz/site/index.html Modified: ofbiz/site/index.html URL: http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1663950r1=1663949r2=1663950view=diff == --- ofbiz/site/index.html (original) +++ ofbiz/site/index.html Wed Mar 4 11:58:00 2015 @@ -179,7 +179,14 @@ -- div h3News/h3 - p class=postmeta + p class=postmeta +span class=dateMarch 4, 2015/span OFBiz at ApacheCon North America 2015 + /p + p + A full day OFBiz track has been included in the schedule at ApacheCon NA 2015 in Austin, Texas (13th - 16th April 2015). The six presentations are planned for the third day (15th April2015).br/ + You can register to attend on the a href=http://events.linuxfoundation.org//events/apachecon-north-america/attend/register; class=external-link rel=nofollow target=externalLinux Foundation website/a and details of the full OFBiz schedule can be found a href=http://apacheconna2015.sched.org/overview/type/ofbiz#.VPbv6zVVKlM; class=external-link rel=nofollow target=externalon Sched.org/abr/ + /p +p class=postmeta span class=dateOctober 6, 2014/span Apache OFBiz 13.07.01 Released /p p @@ -216,49 +223,7 @@ Details of the full OFBiz schedule at ApacheCon Europe can be found a href=http://apacheconeu2014.sched.org/overview/type/ofbiz?iframe=now=i:0;sidebar=yesbg=no#.U9oav_5xOPJ; class=external-link rel=nofollow target=externalhere/abr/ a href=http://bit.ly/1n9YlQT; target=_blankimg src=http://bit.ly/1ttg6CE; width=125 height=125 alt=I'm Speaking at ApacheCon Europe 2014! Join me! title=I'm Speaking at ApacheCon Europe 2014! Join me! border=0/a /p - p class=postmeta -span class=dateJune 16, 2014/span Apache OFBiz 12.04.03 Released - /p - p - Apache OFBiz 12.04.03 is a bug fix release; all users of the 12.04 series are encouraged to upgrade because the new version resolves a series of bugs.br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p - p class=postmeta -span class=dateFebruary 18, 2014/span Apache OFBiz 11.04.04 Released - /p - p - Apache OFBiz 11.04.04 is a bug fix release; all users of the 11.04 series are encouraged to upgrade because the new version resolves a series of bugs.br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p - p class=postmeta -span class=dateJuly 20, 2013/span Apache OFBiz 12.04.02, 11.04.03 and 10.04.06 have been released - /p - p - These are bug fix releases for the 12.04, 11.04, 10.04 series; for the 10.04 series this is the last release; all users of these series are encouraged to upgrade because the new versions resolve some security vulnerabilities (a href=download.html#vulnerabilitiesCVE-2013-2137, CVE-2013-2250/a).br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p - p class=postmeta -span class=dateApril 1, 2013/span Apache OFBiz 12.04.01 Released - /p - p - Apache OFBiz 12.04.01 is the first release of the 12.04 series and contains all the features of the trunk up to April 2012.br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p - p class=postmeta -span class=dateJanuary 18, 2013/span Apache OFBiz 11.04.02 Released - /p - p - Apache OFBiz 11.04.02 is a bug fix release; all users of the 11.04 series are encouraged to upgrade because the new version resolves some security vulnerabilities (a href=http://ofbiz.apache.org/download.html#vulnerabilities;CVE-2013-0177/a).br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p - p class=postmeta -span class=dateJanuary 17, 2013/span Apache OFBiz 10.04.05 Released - /p - p - Apache OFBiz 10.04.05 is a bug fix release; all users of the 10.04 series are encouraged to upgrade because the new version resolves some security vulnerabilities (a href=http://ofbiz.apache.org/download.html#vulnerabilities;CVE-2013-0177/a).br/ - The release files can be downloaded from the a href=download.htmldownload page/a. - /p -/div + /div /div !-- main ends --
svn commit: r1663981 - in /ofbiz/branches/release13.07: ./ framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jleroux Date: Wed Mar 4 13:12:46 2015 New Revision: 1663981 URL: http://svn.apache.org/r1663981 Log: Applied fix from trunk for revision: 1663979 r1663979 | jleroux | 2015-03-04 14:11:41 +0100 (mer., 04 mars 2015) | 13 lines An improved patch from Christian Carlow for Allow FOP to support fo:external-graphic/fo:external for -Dportoffset https://issues.apache.org/jira/browse/OFBIZ-6120 FOP fo:external-graphic/ images do not appear when portoffset used: 2015-02-28 18:12:12,249 |http-bio-8445-exec-4 |ApacheFopWorker |I| FOP FontBaseURL: file:/home/anon/workspace/ofbiz/framework/webapp/config/ 2015-02-28 18:12:12,254 |http-bio-8445-exec-4 |FOP |D| target-resolution set to: 72.0dpi (px2mm=0.3528) 2015-02-28 18:12:12,593 |http-bio-8445-exec-4 |FOP |E| Error with opening URL 'http://localhost:8080/content/control/stream?contentId=10004': Connection refused 2015-02-28 18:12:12,616 |http-bio-8445-exec-4 |FOUserAgent |E| Image not found. URI: /content/control/stream?contentId=10004. (See position 40:158) In framework/webapp/config/fop.xconf basehttp://localhost:8080/base is hardcoded This patch employs FopFactory.setBaseUrl() along with the portOffset from Start class. A better solution might be to extract the port from the baseUrl of fop.xconf and then apply the offset to that but I don't have time to implement that yet. jleroux: I followed Christian's tip to complete his patch Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Propchange: ofbiz/branches/release13.07/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 4 13:12:46 2015 @@ -5,4 +5,4 @@ /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 -/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,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,1612190,16122
svn commit: r1663983 - /ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
Author: jleroux Date: Wed Mar 4 13:17:09 2015 New Revision: 1663983 URL: http://svn.apache.org/r1663983 Log: A patch from Pierre Smits for Have BIRT reporting component visible in secondary app menu https://issues.apache.org/jira/browse/OFBIZ-6122 Currently the birt reporting component is not visible in the main menu of OFBiz, thereby hindering the adoption Modified: ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml Modified: ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml?rev=1663983r1=1663982r2=1663983view=diff == --- ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml Wed Mar 4 13:17:09 2015 @@ -30,33 +30,34 @@ under the License. service-resource type=model loader=main location=servicedef/services.xml/ webapp name=accounting -title=Accounting -server=default-server -location=webapp/accounting -base-permission=OFBTOOLS,ACCOUNTING -mount-point=/accounting/ +title=Accounting +server=default-server +location=webapp/accounting +base-permission=OFBTOOLS,ACCOUNTING +mount-point=/accounting/ webapp name=facility -title=Facility -description=FacilityComponentDescription -server=default-server -location=webapp/facility -base-permission=OFBTOOLS,FACILITY -mount-point=/facility/ +title=Facility +description=FacilityComponentDescription +server=default-server +location=webapp/facility +base-permission=OFBTOOLS,FACILITY +mount-point=/facility/ webapp name=order -title=Order -description=OrderComponentDescription -server=default-server -location=webapp/ordermgr -base-permission=OFBTOOLS,ORDERMGR -mount-point=/ordermgr/ +title=Order +description=OrderComponentDescription +server=default-server +location=webapp/ordermgr +base-permission=OFBTOOLS,ORDERMGR +mount-point=/ordermgr/ webapp name=birt -title=BIRT -server=default-server -location=webapp/birt -base-permission=OFBTOOLS,WEBTOOLS -mount-point=/birt -app-bar-display=false/ +title=BIRT +server=default-server +location=webapp/birt +base-permission=OFBTOOLS,WEBTOOLS +mount-point=/birt +menu-name=secondary +app-bar-display=true/ container name=birt-container loaders=main class=org.ofbiz.birt.container.BirtContainer/
svn commit: r1663979 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jleroux
Date: Wed Mar 4 13:11:41 2015
New Revision: 1663979
URL: http://svn.apache.org/r1663979
Log:
An improved patch from Christian Carlow for Allow FOP to support
fo:external-graphic/fo:external for -Dportoffset
https://issues.apache.org/jira/browse/OFBIZ-6120
FOP fo:external-graphic/ images do not appear when portoffset used:
2015-02-28 18:12:12,249 |http-bio-8445-exec-4 |ApacheFopWorker
|I| FOP FontBaseURL: file:/home/anon/workspace/ofbiz/framework/webapp/config/
2015-02-28 18:12:12,254 |http-bio-8445-exec-4 |FOP
|D| target-resolution set to: 72.0dpi (px2mm=0.3528)
2015-02-28 18:12:12,593 |http-bio-8445-exec-4 |FOP
|E| Error with opening URL
'http://localhost:8080/content/control/stream?contentId=10004': Connection
refused
2015-02-28 18:12:12,616 |http-bio-8445-exec-4 |FOUserAgent
|E| Image not found. URI: /content/control/stream?contentId=10004. (See
position 40:158)
In framework/webapp/config/fop.xconf basehttp://localhost:8080/base is
hardcoded
This patch employs FopFactory.setBaseUrl() along with the portOffset from Start
class.
A better solution might be to extract the port from the baseUrl of fop.xconf
and then apply the offset to that but I don't have time to implement that yet.
jleroux: I followed Christian's tip to complete his patch
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1663979r1=1663978r2=1663979view=diff
==
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
(original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Wed Mar 4 13:11:41 2015
@@ -41,6 +41,7 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.ofbiz.base.location.FlexibleLocation;
+import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.UtilProperties;
@@ -82,6 +83,10 @@ public class ApacheFopWorker {
File userConfigFile = FileUtil.getFile(ofbizHome + fopPath
+ /fop.xconf);
if (userConfigFile.exists()) {
fopFactory.setUserConfig(userConfigFile);
+URL baseUrl = new URL(fopFactory.getBaseURL());
+Integer baseport = baseUrl.getPort();
+Integer port = baseport +
Start.getInstance().getConfig().portOffset;
+fopFactory.setBaseURL(http://localhost:; + port);
} else {
Debug.logWarning(FOP configuration file not found:
+ userConfigFile, module);
}
svn commit: r1663980 - in /ofbiz/branches/release14.12: ./ framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jleroux
Date: Wed Mar 4 13:12:42 2015
New Revision: 1663980
URL: http://svn.apache.org/r1663980
Log:
Applied fix from trunk for revision: 1663979
r1663979 | jleroux | 2015-03-04 14:11:41 +0100 (mer., 04 mars 2015) | 13 lines
An improved patch from Christian Carlow for Allow FOP to support
fo:external-graphic/fo:external for -Dportoffset
https://issues.apache.org/jira/browse/OFBIZ-6120
FOP fo:external-graphic/ images do not appear when portoffset used:
2015-02-28 18:12:12,249 |http-bio-8445-exec-4 |ApacheFopWorker
|I| FOP FontBaseURL: file:/home/anon/workspace/ofbiz/framework/webapp/config/
2015-02-28 18:12:12,254 |http-bio-8445-exec-4 |FOP
|D| target-resolution set to: 72.0dpi (px2mm=0.3528)
2015-02-28 18:12:12,593 |http-bio-8445-exec-4 |FOP
|E| Error with opening URL
'http://localhost:8080/content/control/stream?contentId=10004': Connection
refused
2015-02-28 18:12:12,616 |http-bio-8445-exec-4 |FOUserAgent
|E| Image not found. URI: /content/control/stream?contentId=10004. (See
position 40:158)
In framework/webapp/config/fop.xconf basehttp://localhost:8080/base is
hardcoded
This patch employs FopFactory.setBaseUrl() along with the portOffset from Start
class.
A better solution might be to extract the port from the baseUrl of fop.xconf
and then apply the offset to that but I don't have time to implement that yet.
jleroux: I followed Christian's tip to complete his patch
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 4 13:12:42 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/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
+/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
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1663980r1=1663979r2=1663980view=diff
==
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Wed Mar 4 13:12:42 2015
@@ -41,6 +41,7 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.ofbiz.base.location.FlexibleLocation;
+import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.UtilProperties;
@@ -82,6 +83,10 @@ public class ApacheFopWorker {
File userConfigFile = FileUtil.getFile(ofbizHome + fopPath
+ /fop.xconf);
if (userConfigFile.exists()) {
