buildbot failure in on ofbizTrunkFramework
The Buildbot has detected a new failure on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/147 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1827046 Blamelist: mbrohl BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1827047 - /ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc
Author: mbrohl Date: Fri Mar 16 21:21:36 2018 New Revision: 1827047 URL: http://svn.apache.org/viewvc?rev=1827047=rev Log: Improved: Adjusted the level offsets for core application includes. Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc?rev=1827047=1827046=1827047=diff == --- ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc (original) +++ ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Fri Mar 16 21:21:36 2018 @@ -125,6 +125,6 @@ This section of the manual will describe starting with a high level overview of design and purpose down to the details of how to achieve common tasks. -include::../../applications/accounting/src/docs/asciidoc/accounting.adoc[leveloffset=+1] +include::../../applications/accounting/src/docs/asciidoc/accounting.adoc[leveloffset=+2] -include::../../applications/humanres/src/docs/asciidoc/humanres.adoc[leveloffset=+1] +include::../../applications/humanres/src/docs/asciidoc/humanres.adoc[leveloffset=+2]
svn commit: r1827046 - in /ofbiz/ofbiz-framework/trunk: README.adoc README.md
Author: mbrohl Date: Fri Mar 16 20:56:15 2018 New Revision: 1827046 URL: http://svn.apache.org/viewvc?rev=1827046=rev Log: Improved: Documentation: Convert README.md to README.adoc. (OFBIZ-10272) Replaces the Markdown version with the Asciidoc version to be compatible with the ongoing efforts of the documentation framework. Added: ofbiz/ofbiz-framework/trunk/README.adoc Removed: ofbiz/ofbiz-framework/trunk/README.md Added: ofbiz/ofbiz-framework/trunk/README.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/README.adoc?rev=1827046=auto == --- ofbiz/ofbiz-framework/trunk/README.adoc (added) +++ ofbiz/ofbiz-framework/trunk/README.adoc Fri Mar 16 20:56:15 2018 @@ -0,0 +1,807 @@ +[[apache-ofbiz]] += Apache OFBiz® + +Welcome to *Apache OFBiz*! A powerful top level Apache software project. OFBiz +is an Enterprise Resource Planning (ERP) System written in Java and houses a +large set of libraries, entities, services and features to run all aspects of +your business. + +For more details about OFBiz please visit the OFBiz Documentation page: + +http://ofbiz.apache.org/documentation.html[OFBiz documentation] + +http://www.apache.org/licenses/LICENSE-2.0[OFBiz License] + + +_Note_: If you want to use Eclipse, read the "Setup eclipse project for OFBiz" +section to set it up. + + +_ +_Note_: If you want to use an external database like MySQL or PostgreSQL, read +the "Setup an external database" section to set it up. +_ + + +_Note_: If you want to run OFBiz without an internet connection, read the +"Running gradle tasks without an internet connection" section. + + +__ +_Note_: The directory structure and repositories have changed. For more +information read the "Repository and directory structure" section. +__ + +[[system-requirements]] +== System requirements + +The only requirement to run OFBiz is to have the Java Development Kit (JDK) +version 8 installed on your system (not just the JRE, but the full JDK) which +you can download from the below link. Make sure of setting the $JAVA_HOME +environment variable. + +http://www.oracle.com/technetwork/java/javase/downloads/index.html[JDK download] + +[[quick-start]] +== Quick start + +To quickly install and fire-up OFBiz, please follow the below instructions from +the command line at the OFBiz top level directory (folder) + +In case of problems visit our link:#further-reading[Further reading section] + +[[prepare-ofbiz]] +=== Prepare OFBiz: + +_ +_Note_: Depending on your Internet connection speed it might take a long time +for this step to complete if you are using OFBiz for the first time as it needs +to download all dependencies. So please be patient! +_ + +MS Windows: `gradlew cleanAll loadAll` + +Unix-like OS: `./gradlew cleanAll loadAll` + +[[start-ofbiz]] +=== Start OFBiz: + +MS Windows: `gradlew ofbiz` + +Unix-like OS: `./gradlew ofbiz` + +___ +_Note_: Ignore the % progress indicator because this task does not end as long +as OFBiz is running. +___ + +[[visit-ofbiz-through-your-browser]] +=== Visit OFBiz through your browser: + +https://localhost:8443/ordermgr[Order Back Office] + +https://localhost:8443/accounting[Accounting Back Office] + +https://localhost:8443/webtools[Administrator interface] + +You can log in with the user *admin* and password *ofbiz*. + +[[security]]
svn commit: r1827002 - /ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
Author: jleroux
Date: Fri Mar 16 15:46:57 2018
New Revision: 1827002
URL: http://svn.apache.org/viewvc?rev=1827002=rev
Log:
"Applied fix from trunk for revision: 1826997 "
r1826997 | jleroux | 2018-03-16 16:39:18 +0100 (ven., 16 mars 2018) | 7 lines
Fixed: The server hour normally shown in the jobs list is no longer showing
(OFBIZ-10278)
With FTL formatting in OFBIZ-7636, the commented single line got broken into 3
lines making it an invalid js code.
Thanks: Aditya
Modified:
ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
Modified:
ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl?rev=1827002=1827001=1827002=diff
==
---
ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
(original)
+++
ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
Fri Mar 16 15:46:57 2018
@@ -37,9 +37,7 @@ under the License.
date.setSeconds(date.getSeconds() + 1);
}
// dateFormat does not respect the timezone :/ Fortunately
toString is what we want :)
-//jQuery("#${clockField}
-").text("${uiLabelMap.CommonServerHour}
-: " + dateFormat(date, "-mm-dd HH:MM:ss"));
+//jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: "
+ dateFormat(date, "-mm-dd HH:MM:ss"));
jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " +
date.toString());
}
})
svn commit: r1827000 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ themes/common/template/includes/ServerHour24HourFormatJs.ftl
Author: jleroux
Date: Fri Mar 16 15:45:00 2018
New Revision: 1827000
URL: http://svn.apache.org/viewvc?rev=1827000=rev
Log:
Implemented:
Improved:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 15:45:00 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl?rev=1827000=1826999=1827000=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/ServerHour24HourFormatJs.ftl
Fri Mar 16 15:45:00 2018
@@ -37,9 +37,7 @@ under the License.
date.setSeconds(date.getSeconds() + 1);
}
// dateFormat does not respect the timezone :/ Fortunately
toString is what we want :)
-//jQuery("#${clockField}
-").text("${uiLabelMap.CommonServerHour}
-: " + dateFormat(date, "-mm-dd HH:MM:ss"));
+//jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: "
+ dateFormat(date, "-mm-dd HH:MM:ss"));
jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " +
date.toString());
}
})
svn commit: r1826997 - /ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
Author: jleroux
Date: Fri Mar 16 15:39:18 2018
New Revision: 1826997
URL: http://svn.apache.org/viewvc?rev=1826997=rev
Log:
Fixed: The server hour normally shown in the jobs list is no longer showing
(OFBIZ-10278)
With FTL formatting in OFBIZ-7636, the commented single line got broken into 3
lines making it an invalid js code.
Thanks: Aditya
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl?rev=1826997=1826996=1826997=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
Fri Mar 16 15:39:18 2018
@@ -37,9 +37,7 @@ under the License.
date.setSeconds(date.getSeconds() + 1);
}
// dateFormat does not respect the timezone :/ Fortunately
toString is what we want :)
-//jQuery("#${clockField}
-").text("${uiLabelMap.CommonServerHour}
-: " + dateFormat(date, "-mm-dd HH:MM:ss"));
+//jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: "
+ dateFormat(date, "-mm-dd HH:MM:ss"));
jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " +
date.toString());
}
})
Re: buildbot failure in on ofbizTrunkFramework
Checking that Jacques Le 16/03/2018 à 12:13, build...@apache.org a écrit : The Buildbot has detected a new failure on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/143 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1826949 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
buildbot success in on ofbizBranch17FrameworkPlugins
The Buildbot has detected a restored build on builder ofbizBranch17FrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/75 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release17.12] 1826939 Blamelist: jleroux Build succeeded! Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFramework
The Buildbot has detected a new failure on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/143 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1826949 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/144 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1826950 Blamelist: taher Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/157 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1826931 Blamelist: taher Build succeeded! Sincerely, -The Buildbot
svn commit: r1826950 - /ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc
Author: taher Date: Fri Mar 16 10:06:11 2018 New Revision: 1826950 URL: http://svn.apache.org/viewvc?rev=1826950=rev Log: Implemented: Add section numbering to the documentation user manual (OFBIZ-10285) Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc?rev=1826950=1826949=1826950=diff == --- ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc (original) +++ ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Fri Mar 16 10:06:11 2018 @@ -1,4 +1,5 @@ = Apache OFBiz User Manual +:sectnums: == Introduction to OFBiz
svn commit: r1826949 - /ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Author: jleroux
Date: Fri Mar 16 10:02:03 2018
New Revision: 1826949
URL: http://svn.apache.org/viewvc?rev=1826949=rev
Log:
Improved: Token Based Authentication
(OFBIZ-9833)
Removes the code I temporarily removed on trunk demo (controversial) to test my
changes
Also adds the LoginWorker.autoLoginSet()
This is just a commit to go ahead, later I will revert all related and provide
a patch for discussion at OFBIZ-9833.
I'll also certainly use Deepak's JWTManager.createJwt() instead of mine, it's
more general and I actually only need to pass the userLoginId. We have though
to discuss that anyway, I see some differences...
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1826949=1826948=1826949=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Fri Mar 16 10:02:03 2018
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpSession;
import javax.xml.bind.DatatypeConverter;
import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.DelegatorFactory;
import org.apache.ofbiz.entity.GenericEntityException;
@@ -186,18 +185,13 @@ public class ExternalLoginKeysManager {
Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
-// The target server does not allow external login by default
-boolean useExternalServer =
EntityUtilProperties.getPropertyAsBoolean("security", "use-external-server",
false);
-String sourceWebappName =
request.getParameter(SOURCE_SERVER_WEBAPP_NAME);
-if (!useExternalServer || sourceWebappName == null) return "success";
// Nothing to do here
-
try {
String userLoginId = null;
String authorizationHeader = request.getHeader("Authorization");
if (authorizationHeader != null) {
Claims claims = returnsClaims(authorizationHeader);
userLoginId = getSourceUserLoginId(claims );
-boolean jwtOK = checkJwt(authorizationHeader, userLoginId,
getTargetServerUrl(request), UtilHttp.getApplicationName(request));
+boolean jwtOK = checkJwt(authorizationHeader, userLoginId, "",
"");
if (!jwtOK) {
// Something unexpected happened here
Debug.logWarning("*** There was a problem with the JWT
token, not signin in the user login " + userLoginId, module);
@@ -234,6 +228,9 @@ public class ExternalLoginKeysManager {
Debug.logError(e, "Cannot get autoUserLogin information: " +
e.getMessage(), module);
}
+// make sure the autoUserLogin is set to the same and that the client
cookie has the correct userLoginId
+LoginWorker.autoLoginSet(request, response);
+
return "success";
}
svn commit: r1826948 - /ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc
Author: taher Date: Fri Mar 16 09:52:17 2018 New Revision: 1826948 URL: http://svn.apache.org/viewvc?rev=1826948=rev Log: Implemented: added an introductory paragraph to the core apps section (OFBIZ-10285) Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc?rev=1826948=1826947=1826948=diff == --- ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc (original) +++ ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Fri Mar 16 09:52:17 2018 @@ -112,6 +112,18 @@ first. == Core Business Applications +Most businesses share universal needs. They require accounting functionality, +managing customers, placing orders, book-keeping, invoicing and so on. + +OFBiz is designed so that such basic universal business needs are available +through a set of core business applications. These applications all share a +unified data-model with a set of unified services to implement this +functionality. + +This section of the manual will describe each core business application +starting with a high level overview of design and purpose down to the details +of how to achieve common tasks. + include::../../applications/accounting/src/docs/asciidoc/accounting.adoc[leveloffset=+1] include::../../applications/humanres/src/docs/asciidoc/humanres.adoc[leveloffset=+1]
svn commit: r1826943 - in /ofbiz/branches/release16.11: ./ framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java framework/webapp/src/main/java/org/apache/ofbiz/webapp/cont
Author: jleroux Date: Fri Mar 16 09:45:13 2018 New Revision: 1826943 URL: http://svn.apache.org/viewvc?rev=1826943=rev Log: "Applied fix from trunk framework for revision: 1826938 " r1826938 | jleroux | 2018-03-16 10:35:06 +0100 (ven., 16 mars 2018) | 12 lines Fixed: Logout do not remove autoLogin (OFBIZ-4959) I used the only available (and I must say confusing) WebappInfo.getName() when I needed the webAppName not the WebappInfoName. So this put in a new WebappInfo.getMountPoint() and use it in getWebappInfo Also use LoginWorker.autoLoginSet() in different places where I missed it. In other words all autoUserLogin coockies are deleted on login and logout, and an autoUserLogin cookie is created when going locally from a webapp to another, with checkExternalLoginKey Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 16 09:45:13 2018 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291, 1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291, 1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java?rev=1826943=1826942=1826943=diff == --- ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java (original) +++
svn commit: r1826939 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java framework/webapp/src/main/java/org/apache/o
Author: jleroux
Date: Fri Mar 16 09:36:18 2018
New Revision: 1826939
URL: http://svn.apache.org/viewvc?rev=1826939=rev
Log:
"Applied fix from trunk for revision: 1826938 "
r1826938 | jleroux | 2018-03-16 10:35:06 +0100 (ven., 16 mars 2018) | 12 lines
Fixed: Logout do not remove autoLogin
(OFBIZ-4959)
I used the only available (and I must say confusing) WebappInfo.getName() when
I needed the webAppName not the WebappInfoName. So this put in a new
WebappInfo.getMountPoint() and use it in getWebappInfo
Also use LoginWorker.autoLoginSet() in different places where I missed it. In
other words all autoUserLogin coockies are deleted on login and logout, and
an autoUserLogin cookie is created when going locally from a webapp to another,
with checkExternalLoginKey
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 09:36:18 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java?rev=1826939=1826938=1826939=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
Fri Mar 16 09:36:18 2018
@@ -316,7 +316,8 @@ public final class ComponentConfig {
WebappInfo webappInfo = null;
List webappsInfo = getAppBarWebInfos(serverName);
for(WebappInfo currApp : webappsInfo) {
-if (webAppName.equals(currApp.getName())) {
+String currWebAppName = currApp.getMountPoint().replace("/",
"").replace("*", "");
+if (webAppName.equals(currWebAppName)) {
webappInfo = currApp;
break;
}
@@ -944,6 +945,10 @@ public final class ComponentConfig {
return name;
}
+public String getMountPoint() {
+return mountPoint;
+}
+
public String getTitle() {
return title;
}
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1826939=1826938=1826939=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
Fri Mar 16 09:36:18 2018
@@ -157,7 +157,8 @@ public class ExternalLoginKeysManager {
GenericValue currentUserLogin = (GenericValue)
svn commit: r1826931 - /ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc
Author: taher Date: Fri Mar 16 09:27:12 2018 New Revision: 1826931 URL: http://svn.apache.org/viewvc?rev=1826931=rev Log: Implemented: add the introduction section of the OFBiz user manual (OFBIZ-10285) This brief introduction explains high level concepts along with the welcome message to give beginners and idea of what OFBiz is and the purpose behind its design. Thank you: Michael Brohl and Sharan Foga for review and feedback. Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Modified: ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc?rev=1826931=1826930=1826931=diff == --- ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc (original) +++ ofbiz/ofbiz-framework/trunk/docs/asciidoc/user-manual.adoc Fri Mar 16 09:27:12 2018 @@ -8,9 +8,9 @@ houses a large set of libraries, entitie all aspects of your business. This manual will describe all aspects of this powerful ERP system. The manual -starts with the basics of what OFBiz and how it works, and describes high level -concepts like the entity engine, service engine, widget system and so on. In -addition the manual explains the core application of this framework like the +starts with the basics of what OFBiz is and how it works, and describes high +level concepts like the entity engine, service engine, widget system and so on. +In addition the manual explains the core application of this framework like the Party Manager, Order Manager, Accounting system, and others. If you wish to contribute to OFBiz and help make it better, you may wish to read @@ -19,25 +19,99 @@ architectural concepts of the framework. === What is Apache OFBiz +It is hard to define OFBiz because it offers many different solutions targeted +at different levels of interests (users, developers, business owners). At a low +level it may considered a web framework, at another level, it may +considered a full fledged ERP system, and yet it can also be considered a +business automation suite. + === The main parts of Apache OFBiz +Perhaps to better understand what OFBiz is, it may be necessary to understand +its main parts and the purpose that each part plays. Thus the main parts or +sub-systems are summarized below. + Web MVC Framework +The lowest or most foundational part of Apache OFBiz is a classical web MVC +(Model View Controller) framework. This part of the system is designed for basic +routing of web requests and may be considered as the infrastructure or plumbing +where everything is wired together. + Entity Engine +The entity engine allows OFBiz users to define entities, data, and queries in a +database-independent domain specific language (DSL) based on XML. Thus, without +learning any SQL users can create and interact with databases in a +platform-independent manner and Apache OFBiz would make the translations under +the hood to each database system. + Service Engine +Apache OFBiz is designed specifically around a Service Oriented Architecture +(SOA). Services are units of business logic that take a set of input values and +produces a set of output values. + +Services are programming-language-independent. It does not matter whether a +service is implemented using Java, Groovy, Jython, or something else because +services are an abstraction away from the underlying technology. This provides +maximum flexibility for desingning business logic without worrying about +interoperability between different languages. + Widget System +Whether the output is HTML, CSV, PDF, or something else, Apache OFBiz provides a +system for creating user interface that is independent of the actual +implementation. This makes it possible to publish the same widget to HTML, PDF, +CSV or some other output format. + +However, the widget system allows users, if needed, to drop down to any +platform-specific code and mix it with widget designs, thus providing a mix +between ease of use, platform indepedendence and customizability. + Data Model Library +Apache OFBiz is heavily inspired by a book called the "The Data Model Resource +Book". This book provides a "A Library of Universal Data Models for All +Enterprises". These models cover things like parties, orders, invoices, +payments, general ledgers, quotes and much more. + +By using OFBiz, adopters start with a full pre-designed data model that covers +common and universal business requirements. Hundreds of entities are defined +which save many hours of thinking, designing, and testing such models. + +It is important to note that the data model library does not only cover +entities, but also the data that comes with these entities. Data is further +categorized by function (seed, demo, etc ...) + Service Library +Having a rich and powerful data model is not very useful on its own without
