svn commit: r1657333 - in /ofbiz/branches/release14.12: ./ .classpath
Author: jleroux Date: Wed Feb 4 17:25:52 2015 New Revision: 1657333 URL: http://svn.apache.org/r1657333 Log: Applied fix from trunk for revision: 1657323 r1657323 | jleroux | 2015-02-04 18:07:27 +0100 (mer. 04 févr. 2015) | 3 lignes This adds commons-discovery-0.5.jar in .classpath. I missed it in r1641037. In a next commit I will sort the lines. Sorry for the inconvenience, this should have been done when paths changed. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/.classpath Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 4 17:25:52 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323 Modified: ofbiz/branches/release14.12/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1657333r1=1657332r2=1657333view=diff == --- ofbiz/branches/release14.12/.classpath (original) +++ ofbiz/branches/release14.12/.classpath Wed Feb 4 17:25:52 2015 @@ -119,6 +119,7 @@ classpathentry kind=lib path=specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar/ classpathentry kind=lib path=specialpurpose/birt/lib/axis-1.4.jar/ classpathentry kind=lib path=specialpurpose/birt/lib/axis-ant-1.4.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/commons-discovery-0.5.jar/ classpathentry kind=lib path=framework/service/lib/wsdl4j-1.6.2.jar/ classpathentry kind=lib path=framework/service/lib/axiom-api-1.2.9.jar/ classpathentry kind=lib path=framework/service/lib/axiom-impl-1.2.9.jar/
svn commit: r1657323 - /ofbiz/trunk/.classpath
Author: jleroux Date: Wed Feb 4 17:07:27 2015 New Revision: 1657323 URL: http://svn.apache.org/r1657323 Log: This adds commons-discovery-0.5.jar in .classpath. I missed it in r1641037. In a next commit I will sort the lines. Sorry for the inconvenience, this should have been done when paths changed. Modified: ofbiz/trunk/.classpath Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1657323r1=1657322r2=1657323view=diff == --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Wed Feb 4 17:07:27 2015 @@ -119,6 +119,7 @@ classpathentry kind=lib path=specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar/ classpathentry kind=lib path=specialpurpose/birt/lib/axis-1.4.jar/ classpathentry kind=lib path=specialpurpose/birt/lib/axis-ant-1.4.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/commons-discovery-0.5.jar/ classpathentry kind=lib path=framework/service/lib/wsdl4j-1.6.2.jar/ classpathentry kind=lib path=framework/service/lib/axiom-api-1.2.9.jar/ classpathentry kind=lib path=framework/service/lib/axiom-impl-1.2.9.jar/
svn commit: r1657332 - /ofbiz/trunk/.classpath
Author: jleroux Date: Wed Feb 4 17:25:11 2015 New Revision: 1657332 URL: http://svn.apache.org/r1657332 Log: Sort lines by blocks and alphabetically Modified: ofbiz/trunk/.classpath Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1657332r1=1657331r2=1657332view=diff == --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Wed Feb 4 17:25:11 2015 @@ -88,8 +88,6 @@ classpathentry kind=lib path=framework/base/lib/scripting/groovy-all-2.2.1.jar/ classpathentry kind=lib path=framework/base/lib/scripting/jakarta-oro-2.0.8.jar/ classpathentry kind=lib path=framework/base/lib/scripting/jython-nooro.jar/ -classpathentry kind=lib path=specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar/ -classpathentry kind=lib path=specialpurpose/birt/lib/viewservlets.jar/ classpathentry kind=lib path=framework/catalina/lib/ecj-4.4.jar/ classpathentry kind=lib path=framework/catalina/lib/tomcat-7.0.57-catalina-ha.jar/ classpathentry kind=lib path=framework/catalina/lib/tomcat-7.0.57-catalina-tribes.jar/ @@ -102,24 +100,6 @@ classpathentry kind=lib path=framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar/ classpathentry kind=lib path=framework/entity/lib/commons-dbcp2-2.0.1.jar/ classpathentry kind=lib path=framework/geronimo/lib/geronimo-transaction-3.1.1.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/com.sun.el-2.2.0.v20110806.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-io-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-security-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-server-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-servlet-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-util-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-webapp-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-xml-8.1.2.v20120308.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar/ -classpathentry kind=lib path=specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar/ -classpathentry kind=lib path=specialpurpose/birt/lib/axis-1.4.jar/ -classpathentry kind=lib path=specialpurpose/birt/lib/axis-ant-1.4.jar/ -classpathentry kind=lib path=specialpurpose/birt/lib/commons-discovery-0.5.jar/ classpathentry kind=lib path=framework/service/lib/wsdl4j-1.6.2.jar/ classpathentry kind=lib path=framework/service/lib/axiom-api-1.2.9.jar/ classpathentry kind=lib path=framework/service/lib/axiom-impl-1.2.9.jar/ @@ -134,17 +114,37 @@ classpathentry kind=lib path=framework/webapp/lib/ezmorph-0.9.1.jar/ classpathentry kind=lib path=framework/webapp/lib/iText-2.1.7.jar/ classpathentry kind=lib path=framework/webapp/lib/rome-0.9.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/axis-1.4.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/axis-ant-1.4.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/commons-discovery-0.5.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar/ +classpathentry kind=lib path=specialpurpose/birt/lib/viewservlets.jar/ +classpathentry kind=lib path=specialpurpose/ebaystore/lib/attributes.jar/ +classpathentry kind=lib path=specialpurpose/ebaystore/lib/ebaycalls.jar/ +classpathentry kind=lib path=specialpurpose/ebaystore/lib/ebaysdkcore.jar/ +classpathentry kind=lib path=specialpurpose/ebaystore/lib/helper.jar/ classpathentry kind=lib path=specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar/ +classpathentry kind=lib path=specialpurpose/jetty/lib/com.sun.el-2.2.0.v20110806.jar/ +classpathentry kind=lib path=specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar/ +classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar/ +classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar/ +classpathentry kind=lib path=specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar/ +
svn commit: r1657079 - in /ofbiz/branches/release14.12: ./ applications/humanres/data/ applications/humanres/data/helpdata/
Author: sharan Date: Wed Feb 4 10:04:30 2015 New Revision: 1657079 URL: http://svn.apache.org/r1657079 Log: Applied fix from trunk for revision: 1654509 === OFBIZ 6015 - added more HR help pages Added: ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmplPosition.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeLeaves.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeQuals.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeSkills.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployeeTrainings.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EditEmployment.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmplPositionView.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_EmployeeProfile.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmplPositions.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_FindEmployments.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmplPositions.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_ListEmployments.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_NewEmployee.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_PayrollHistory.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml - copied unchanged from r1654509, ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_findEmployees.xml Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR.xml ofbiz/branches/release14.12/applications/humanres/data/helpdata/HELP_HR_main.xml Propchange: ofbiz/branches/release14.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 4 10:04:30 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1655046,1655668,1655979,1656185,1656198,1656445,1656983 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983 Modified: ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml?rev=1657079r1=1657078r2=1657079view=diff == --- ofbiz/branches/release14.12/applications/humanres/data/HumanResHelpData.xml (original) +++
