svn commit: r1620803 [1/3] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1620803 [1/3] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Wed Aug 27 08:29:10 2014 New Revision: 1620803 URL: http://svn.apache.org/r1620803 Log: Keeps in sync with OFBiz trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml - copied unchanged from r1620799, ofbiz/trunk/framework/base/config/log4j2.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.1.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-1.2-api-2.0.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/log4j-1.2-api-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-api-2.0.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/log4j-api-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-core-2.0.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/log4j-core-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-jcl-2.0.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/log4j-jcl-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-slf4j-impl-2.0.1.jar - copied unchanged from r1620799, ofbiz/trunk/framework/base/lib/log4j-slf4j-impl-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/lib/jdbc/derby-10.10.2.0.jar - copied unchanged from r1620799, ofbiz/trunk/framework/entity/lib/jdbc/derby-10.10.2.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/ConnectionFactory.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/ConnectionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/jdbc/ConnectionFactoryLoader.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/ConnectionFactoryLoader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DumbTransactionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/JNDITransactionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryLoader.java - copied unchanged from r1620799, ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryLoader.java Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/avalon-util-exception-1.0.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-1.2.17.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/slf4j-log4j12-1.6.4.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/NotifyLevel.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/lib/jdbc/derby-10.10.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/EntityConfigUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/ConnectionFactoryInterface.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/jdbc/ConnectionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/DumbFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryInterface.java Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/web.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/PartyProfileContent.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/debug.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ConnectionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Datasource.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DebugXaResources.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DelegatorElement.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityDataReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityEcaReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityGroupReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityModelReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/FieldType.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/GroupMap.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/JndiJdbc.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ReadData.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Resource.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ResourceLoader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/SqlLoadPath.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/TransactionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/TransactionManagerJndi.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/TyrexDataSource.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/UserTransactionJndi.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/datasource/MemoryHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceSynchronization.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/ModelWriter.jsp ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/widget/LogForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/widget/LogScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1618551-1620799 Merged /ofbiz/branches/framework-api-cleanup:r1619853-1620529 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Wed Aug 27 08:29:10 2014 @@ -39,7 +39,7 @@ <classpathentry kind="lib" path="framework/base/lib/juel-impl-2.2.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/juel-spi-2.2.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/> - <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.17.jar"/> + <classpathentry kind="lib" path="framework/base/lib/log4j-api-2.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mail-1.5.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/> @@ -78,10 +78,10 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.4.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-csv-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Wed Aug 27 08:29:10 2014 @@ -15,7 +15,6 @@ framework/base/lib/ant-1.9.0-ant.jar framework/base/lib/ant-1.9.0-ant-junit.jar framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar framework/base/lib/avalon-framework-4.2.0.jar -framework/base/lib/avalon-util-exception-1.0.0.jar framework/base/lib/batik-all-1.7.jar framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar framework/base/lib/clhm-release-1.0-lru.jar @@ -28,7 +27,11 @@ framework/base/lib/jakarta-regexp-1.5.ja framework/base/lib/jpim-0.1.jar framework/base/lib/juel-impl-2.2.7.jar framework/base/lib/juel-spi-2.2.7.jar -framework/base/lib/log4j-1.2.17.jar +framework/base/lib/log4j-1.2-api-2.0.1.jar +framework/base/lib/log4j-api-2.0.1.jar +framework/base/lib/log4j-core-2.0.1.jar +framework/base/lib/log4j-jcl-2.0.1.jar +framework/base/lib/log4j-slf4j-impl-2.0.1.jar framework/base/lib/mx4j-3.0.1.jar framework/base/lib/mx4j-remote-3.0.1.jar framework/base/lib/nekohtml-1.9.16.jar @@ -58,10 +61,10 @@ framework/base/lib/commons/commons-pool2 framework/base/lib/commons/commons-primitives-1.0.jar framework/base/lib/commons/commons-validator-1.4.0.jar framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar -framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar +framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar -framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar +framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.1.1.jar framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar framework/base/lib/j2eespecs/annotations-api-3.0.jar @@ -85,8 +88,7 @@ framework/catalina/lib/tomcat-7.0.55-tom framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar framework/entity/lib/commons-dbcp2-2.0.1.jar -framework/entity/lib/jdbc/derby-10.10.1.1.jar -framework/entity/lib/jdbc/derbytools-10.8.2.2.jar +framework/entity/lib/jdbc/derby-10.10.2.0.jar framework/service/lib/axiom-api-1.2.9.jar framework/service/lib/axiom-impl-1.2.9.jar framework/service/lib/axis2-kernel-1.5.2.jar @@ -1214,7 +1216,6 @@ MIT/X License: framework/base/lib/icu4j-52_1.jar framework/base/lib/jcl-over-slf4j-1.6.4.jar framework/base/lib/slf4j-api-1.6.4.jar -framework/base/lib/slf4j-log4j12-1.6.4.jar framework/images/webapp/images/jquery/* framework/images/webapp/images/date/date.format-1.2.3*.js ========================================================================= Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Wed Aug 27 08:29:10 2014 @@ -188,9 +188,7 @@ public class TrackingCodeEvents { //persist that info by associating with the current visit GenericValue visit = VisitHandler.getVisit(request.getSession()); - if (visit == null && !UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visit", "false")) { - Debug.logWarning("Could not get visit, not associating trackingCode [" + trackingCodeId + "] with visit", module); - } else { + if (visit != null) { GenericValue trackingCodeVisit = delegator.makeValue("TrackingCodeVisit", UtilMisc.toMap("trackingCodeId", trackingCodeId, "visitId", visit.get("visitId"), "fromDate", UtilDateTime.nowTimestamp(), "sourceEnumId", sourceEnumId)); @@ -312,9 +310,7 @@ public class TrackingCodeEvents { Delegator delegator = (Delegator) request.getAttribute("delegator"); java.sql.Timestamp nowStamp = UtilDateTime.nowTimestamp(); GenericValue visit = VisitHandler.getVisit(request.getSession()); - if (visit == null && !UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visit", "false")) { - Debug.logWarning("Could not get visit, not checking trackingCode cookies to associate with visit", module); - } else { + if (visit != null) { // loop through cookies and look for ones with a name that starts with TKCDT_ for trackable cookies Cookie[] cookies = request.getCookies(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Wed Aug 27 08:29:10 2014 @@ -535,19 +535,14 @@ under the License. <if-empty field="totalsMap[receipt.returnItemSeqId]"> <set field="totalsMap[receipt.returnItemSeqId]" value="0" type="BigDecimal"/> </if-empty> - <calculate field="totalsMap[receipt.returnItemSeqId]"> - <calcop field="totalsMap[receipt.returnItemSeqId]" operator="add"> - <calcop field="receipt.quantityAccepted" operator="get"/> - <calcop field="receipt.quantityRejected" operator="get"/> - </calcop> - </calculate> + <set field="totalsMap[receipt.returnItemSeqId]" from="totalsMap[receipt.returnItemSeqId] + (receipt.quantityAccepted + receipt.quantityRejected)"/> </iterate> <get-related relation-name="ReturnItem" list="returnItems" value-field="returnHeader"/> <iterate-map key="returnItemSeqId" value="value" map="totalsMap"> - <set field="filterMap.returnItemSeqId" from-field="returnItemSeqId"/> + <set field="filterMap.returnItemSeqId" from="returnItemSeqId"/> <filter-list-by-and list="returnItems" map="filterMap" to-list="items"/> <first-from-list entry="item" list="items"/> - <set field="item.receivedQuantity" from-field="value" type="BigDecimal"/> + <set field="item.receivedQuantity" from="value" type="BigDecimal"/> <set-service-fields service-name="updateReturnItem" map="item" to-map="serviceInMap"/> <if-compare-field field="value" to-field="item.returnQuantity" operator="greater-equals" type="BigDecimal"> <!-- update the status for the item --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java Wed Aug 27 08:29:10 2014 @@ -70,8 +70,7 @@ public class CartEventListener implement GenericValue visit = VisitHandler.getVisit(session); if (visit == null) { - if (UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visit", "false")) return; - Debug.logError("Could not get the current visit, not saving abandoned cart info.", module); + Debug.logInfo("Could not get the current visit, not saving abandoned cart info.", module); return; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/web.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/web.xml Wed Aug 27 08:29:10 2014 @@ -50,7 +50,8 @@ under the License. </init-param> <init-param> <param-name>allowedPaths</param-name> - <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value> + <!-- Beware, if you use the Birt component, allowedPaths are not defined here anymore but in Birt web.xml--> + <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/js:/includes/maincss.css</param-value> </init-param> <init-param> <param-name>errorCode</param-name> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/PartyProfileContent.js URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/PartyProfileContent.js (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/js/PartyProfileContent.js Wed Aug 27 08:29:10 2014 @@ -24,7 +24,7 @@ var uiLabelJsonObject = null; jQuery(document).ready(function() { var labelObject = { - "CommonUiLabels" : ["CommonUpload", "CommonSave", "CommonCompleted"], + "CommonUiLabels" : ["CommonUpload", "CommonSave", "CommonCompleted"] }; uiLabelJsonObjects = getJSONuiLabels(labelObject); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearch.java Wed Aug 27 08:29:10 2014 @@ -47,7 +47,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityConditionSubSelect; import org.ofbiz.entity.condition.EntityConditionValue; import org.ofbiz.entity.condition.EntityOperator; -import org.ofbiz.entity.config.EntityConfigUtil; +import org.ofbiz.entity.config.model.EntityConfig; import org.ofbiz.entity.model.DynamicViewEntity; import org.ofbiz.entity.model.ModelKeyMap; import org.ofbiz.entity.model.ModelViewEntity.ComplexAlias; @@ -647,7 +647,7 @@ public class ProductSearch { this.entityConditionList.add(topCond); - Debug.logInfo("topCond=" + topCond.makeWhereString(null, FastList.<EntityConditionParam>newInstance(), EntityConfigUtil.getDatasource(delegator.getEntityHelperName("Product"))), module); + Debug.logInfo("topCond=" + topCond.makeWhereString(null, FastList.<EntityConditionParam>newInstance(), EntityConfig.getDatasource(delegator.getEntityHelperName("Product"))), module); } public EntityListIterator doQuery(Delegator delegator) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/debug.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/debug.properties?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/debug.properties (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/debug.properties Wed Aug 27 08:29:10 2014 @@ -21,12 +21,6 @@ # OFBiz Debug Settings #### -# Pack Exception Report Using Avalon Exception Util -pack.exception=true - -# Disable log4j config (used when other app servers handle the config) -disable.log4j.config=false - # These top level switches are used before calling Log4J, or if Log4J is not used print.verbose=false print.timing=true Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ContainerLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Wed Aug 27 08:29:10 2014 @@ -27,8 +27,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.log4j.Appender; -import org.apache.log4j.Logger; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.start.Config; import org.ofbiz.base.start.StartupException; @@ -270,12 +268,6 @@ public class ContainerLoader implements Debug.logInfo("Stopped container " + container.getName(), module); } } - @SuppressWarnings("unchecked") - Enumeration<Appender> en = Logger.getRootLogger().getAllAppenders(); - while (en.hasMoreElements()) { - Appender appender = en.nextElement(); - appender.close(); - } } } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java Wed Aug 27 08:29:10 2014 @@ -18,23 +18,15 @@ *******************************************************************************/ package org.ofbiz.base.util; -import java.io.IOException; import java.io.PrintStream; import java.io.PrintWriter; -import java.util.Enumeration; import java.util.Formatter; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.avalon.util.exception.ExceptionHelper; -import org.apache.log4j.Appender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.RollingFileAppender; -import org.apache.log4j.spi.LoggerRepository; +import org.apache.logging.log4j.*; import org.ofbiz.base.conversion.ConversionException; import org.ofbiz.base.conversion.DateTimeConverters.DateToString; @@ -57,22 +49,20 @@ public final class Debug { public static final int WARNING = 5; public static final int ERROR = 6; public static final int FATAL = 7; - public static final int NOTIFY = 8; - public static final String[] levels = {"Always", "Verbose", "Timing", "Info", "Important", "Warning", "Error", "Fatal", "Notify"}; - public static final String[] levelProps = {"", "print.verbose", "print.timing", "print.info", "print.important", "print.warning", "print.error", "print.fatal", "print.notify"}; - public static final Level[] levelObjs = {Level.INFO, Level.DEBUG, Level.INFO, Level.INFO, Level.INFO, Level.WARN, Level.ERROR, Level.FATAL, NotifyLevel.NOTIFY}; + public static final String[] levels = {"Always", "Verbose", "Timing", "Info", "Important", "Warning", "Error", "Fatal"}; + public static final String[] levelProps = {"", "print.verbose", "print.timing", "print.info", "print.important", "print.warning", "print.error", "print.fatal"}; + public static final Level[] levelObjs = {Level.FATAL, Level.DEBUG, Level.TRACE, Level.INFO, Level.INFO, Level.WARN, Level.ERROR, Level.FATAL}; protected static Map<String, Integer> levelStringMap = new HashMap<String, Integer>(); protected static PrintStream printStream = System.out; protected static PrintWriter printWriter = new PrintWriter(printStream); - protected static boolean levelOnCache[] = new boolean[9]; - protected static boolean packException = true; + protected static boolean levelOnCache[] = new boolean[8]; protected static final boolean useLevelOnCache = true; - protected static Logger root = Logger.getRootLogger(); + protected static Logger root = LogManager.getRootLogger(); static { levelStringMap.put("verbose", Debug.VERBOSE); @@ -83,32 +73,11 @@ public final class Debug { levelStringMap.put("error", Debug.ERROR); levelStringMap.put("fatal", Debug.FATAL); levelStringMap.put("always", Debug.ALWAYS); - levelStringMap.put("notify", Debug.NOTIFY); - - // initialize Log4J - if (!UtilProperties.propertyValueEqualsIgnoreCase("debug.properties", "disable.log4j.config", "true")) { - org.apache.log4j.xml.DOMConfigurator.configure(UtilURL.fromResource("log4j.xml")); - } // initialize levelOnCache - for (int i = 0; i < 9; i++) { + for (int i = 0; i < levelOnCache.length; i++) { levelOnCache[i] = (i == Debug.ALWAYS || UtilProperties.propertyValueEqualsIgnoreCase("debug.properties", levelProps[i], "true")); } - - if (SYS_DEBUG != null) { - for (int x = 0; x < 8; x++) { - levelOnCache[x] = true; - } - LoggerRepository repo = root.getLoggerRepository(); - Enumeration<Logger> en = UtilGenerics.cast(repo.getCurrentLoggers()); - while (en.hasMoreElements()) { - Logger thisLogger = en.nextElement(); - thisLogger.setLevel(Level.DEBUG); - } - } - - // configure exception packing - packException = UtilProperties.propertyValueEqualsIgnoreCase("debug.properties", "pack.exception", "true"); } public static PrintStream getPrintStream() { @@ -126,7 +95,7 @@ public final class Debug { public static Logger getLogger(String module) { if (UtilValidate.isNotEmpty(module)) { - return Logger.getLogger(module); + return LogManager.getLogger(module); } else { return root; } @@ -138,16 +107,6 @@ public final class Debug { return levelStringMap.get(levelName.toLowerCase()); } - /** Gets an int representing the level number from a String representing the level name; if level not found defaults to Debug.INFO */ - public static int getLevelFromStringWithDefault(String levelName) { - Integer levelInt = getLevelFromString(levelName); - if (levelInt == null) { - return Debug.INFO; - } else { - return levelInt; - } - } - public static void log(int level, Throwable t, String msg, String module) { log(level, t, msg, module, "org.ofbiz.base.util.Debug", emptyParams); } @@ -161,86 +120,19 @@ public final class Debug { } public static void log(int level, Throwable t, String msg, String module, String callingClass, Object... params) { - Logger logger = null; - boolean offSetInLogConfig = false; - boolean fatalSetInLogConfig = false; - boolean errorSetInLogConfig = false; - boolean warnSetInLogConfig = false; - boolean infoSetInLogConfig = false; - boolean traceSetInLogConfig = false; - boolean debugSetInLogConfig = false; - boolean allSetInLogConfig = false; - boolean setInLogConfig = false; - - if (useLog4J) { - logger = getLogger(module); - - // Class - if (logger != null) { - Level loggerLevel = logger.getLevel(); - offSetInLogConfig = Level.OFF.equals(loggerLevel); - fatalSetInLogConfig = Level.FATAL.equals(loggerLevel); - errorSetInLogConfig = Level.ERROR.equals(loggerLevel); - warnSetInLogConfig = Level.WARN.equals(loggerLevel); - infoSetInLogConfig = Level.INFO.equals(loggerLevel); - traceSetInLogConfig = Level.TRACE.equals(loggerLevel); - debugSetInLogConfig = Level.DEBUG.equals(loggerLevel); - allSetInLogConfig = Level.ALL.equals(loggerLevel); - } - setInLogConfig = offSetInLogConfig || fatalSetInLogConfig || errorSetInLogConfig || warnSetInLogConfig || infoSetInLogConfig - || traceSetInLogConfig || debugSetInLogConfig || allSetInLogConfig; - // Package - // !setInLogConfig : for a Class logger, Class setting takes precedence on Package if both are used - if (!noModuleModule.equals(module) && module != null && !module.isEmpty() && !setInLogConfig) { - Logger packageLogger = getLogger(module.substring(0, module.lastIndexOf("."))); - if (packageLogger != null) { - Level packageLoggerLevel = packageLogger.getLevel(); - offSetInLogConfig |= Level.OFF.equals(packageLoggerLevel); - fatalSetInLogConfig |= Level.FATAL.equals(packageLoggerLevel); - errorSetInLogConfig |= Level.ERROR.equals(packageLoggerLevel); - warnSetInLogConfig |= Level.WARN.equals(packageLoggerLevel); - infoSetInLogConfig |= Level.INFO.equals(packageLoggerLevel); - traceSetInLogConfig |= Level.TRACE.equals(packageLoggerLevel); - debugSetInLogConfig |= Level.DEBUG.equals(packageLoggerLevel); - allSetInLogConfig |= Level.ALL.equals(packageLoggerLevel); - } - } - setInLogConfig = offSetInLogConfig || fatalSetInLogConfig || errorSetInLogConfig || warnSetInLogConfig || infoSetInLogConfig - || traceSetInLogConfig || debugSetInLogConfig || allSetInLogConfig; - } - - if (isOn(level) || setInLogConfig) { + if (isOn(level)) { if (msg != null && params.length > 0) { StringBuilder sb = new StringBuilder(); Formatter formatter = new Formatter(sb); formatter.format(msg, params); msg = sb.toString(); } - // pack the exception - if (packException && t != null) { - msg = System.getProperty("line.separator") + ExceptionHelper.packException(msg, t, true); - t = null; - } // log if (useLog4J) { - if (SYS_DEBUG != null) { - logger.setLevel(Level.DEBUG); - } - if (offSetInLogConfig) { - // Not printing anything - } else if (fatalSetInLogConfig && Level.FATAL.equals(levelObjs[level]) - || errorSetInLogConfig && Level.ERROR.equals(levelObjs[level]) - || warnSetInLogConfig && Level.WARN.equals(levelObjs[level]) - || infoSetInLogConfig && Level.INFO.equals(levelObjs[level]) - || debugSetInLogConfig && Level.DEBUG.equals(levelObjs[level]) - || traceSetInLogConfig && Level.DEBUG.equals(levelObjs[level])) { - logger.log(callingClass, levelObjs[level], msg, t); - } else if (allSetInLogConfig) { - logger.log(callingClass, Level.INFO, msg, t); - } else { - logger.log(callingClass, levelObjs[level], msg, t); - } + Logger logger = getLogger(module); + //callingClass + logger.log(levelObjs[level], msg, t); } else { StringBuilder prefixBuf = new StringBuilder(); @@ -276,7 +168,7 @@ public final class Debug { if (useLevelOnCache) { return levelOnCache[level]; } else { - return (level == Debug.ALWAYS || UtilProperties.propertyValueEqualsIgnoreCase("debug", levelProps[level], "true")); + return (level == Debug.ALWAYS || UtilProperties.propertyValueEqualsIgnoreCase("debug.properties", levelProps[level], "true")); } } @@ -481,26 +373,6 @@ public final class Debug { log(Debug.FATAL, t, msg, module, params); } - public static void logNotify(String msg, String module) { - log(Debug.NOTIFY, null, msg, module, emptyParams); - } - - public static void logNotify(String msg, String module, Object... params) { - log(Debug.NOTIFY, null, msg, module, params); - } - - public static void logNotify(Throwable t, String module) { - log(Debug.NOTIFY, t, null, module, emptyParams); - } - - public static void logNotify(Throwable t, String msg, String module) { - log(Debug.NOTIFY, t, msg, module, emptyParams); - } - - public static void logNotify(Throwable t, String msg, String module, Object... params) { - log(Debug.NOTIFY, t, msg, module, params); - } - public static void set(int level, boolean on) { if (!useLevelOnCache) return; @@ -512,72 +384,4 @@ public final class Debug { return true; return levelOnCache[level]; } - - public static synchronized Appender getNewFileAppender(String name, String logFile, long maxSize, int backupIdx, String pattern) { - if (pattern == null) { - pattern = "%-5r[%24F:%-3L:%-5p]%x %m%n"; - } - - PatternLayout layout = new PatternLayout(pattern); - layout.activateOptions(); - - RollingFileAppender newAppender = null; - try { - newAppender = new RollingFileAppender(layout, logFile, true); - } catch (IOException e) { - logFatal(e, Debug.class.getName()); - } - - if (newAppender != null) { - if (backupIdx > 0) { - newAppender.setMaxBackupIndex(backupIdx); - } - if (maxSize > 0) { - newAppender.setMaximumFileSize(maxSize); - } - newAppender.setThreshold(Level.DEBUG); - newAppender.activateOptions(); - newAppender.setName(name); - } - - return newAppender; - } - - public static boolean registerFileAppender(String module, String name, String logFile, long maxSize, int backupIdx, String pattern) { - Logger logger = Logger.getLogger(module); - boolean found = false; - - Appender foundAppender = logger.getAppender(name); - if (foundAppender == null) { - Enumeration<Logger> currentLoggerEnum = UtilGenerics.cast(Logger.getRootLogger().getLoggerRepository().getCurrentLoggers()); - while (currentLoggerEnum.hasMoreElements() && foundAppender == null) { - Logger log = currentLoggerEnum.nextElement(); - foundAppender = log.getAppender(name); - } - } else { - return true; - } - - if (foundAppender == null) { - if (logFile != null) { - foundAppender = getNewFileAppender(name, logFile, maxSize, backupIdx, pattern); - if (foundAppender != null) { - found = true; - } - } - } else { - found = true; - } - - logger.addAppender(foundAppender); - return found; - } - - public static boolean registerFileAppender(String module, String name, String logFile) { - return registerFileAppender(module, name, logFile, 0, 10, null); - } - - public static boolean registerFileAppender(String module, String name) { - return registerFileAppender(module, name, null, -1, -1, null); - } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Wed Aug 27 08:29:10 2014 @@ -190,19 +190,17 @@ public class UtilCache<K, V> implements public static String getPropertyParam(ResourceBundle res, String[] propNames, String parameter) { try { - for (String propName: propNames) { - if(res.containsKey(propName+ '.' + parameter)) { - try { - return res.getString(propName + '.' + parameter); - } catch (MissingResourceException e) {} - } + for (String propName : propNames) { + String key = propName.concat(".").concat(parameter); + if (res.containsKey(key)) { + try { + return res.getString(key); + } catch (MissingResourceException e) { + } + } } - // don't need this, just return null - //if (value == null) { - // throw new MissingResourceException("Can't find resource for bundle", res.getClass().getName(), Arrays.asList(propNames) + "." + parameter); - //} } catch (Exception e) { - Debug.logWarning(e, "Error getting " + parameter + " value from cache.properties file for propNames: " + propNames, module); + Debug.logWarning(e, "Error getting " + parameter + " value from ResourceBundle for propNames: " + propNames, module); } return null; } @@ -212,7 +210,11 @@ public class UtilCache<K, V> implements } public void setPropertiesParams(String[] propNames) { - ResourceBundle res = ResourceBundle.getBundle("cache"); + setPropertiesParams("cache", propNames); + } + + public void setPropertiesParams(String settingsResourceName, String[] propNames) { + ResourceBundle res = ResourceBundle.getBundle(settingsResourceName); if (res != null) { String value = getPropertyParam(res, propNames, "maxSize"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/servicedef/services.xml Wed Aug 27 08:29:10 2014 @@ -86,13 +86,6 @@ under the License. <attribute name="timing" type="String" mode="IN" optional="true"/> <attribute name="verbose" type="String" mode="IN" optional="true"/> </service> - <service name="addOrUpdateLogger" engine="java" - location="org.ofbiz.common.CommonServices" invoke="addOrUpdateLogger" auth="true"> - <description>Add/Update logger in logging system</description> - <attribute name="name" type="String" mode="IN" optional="false"/> - <attribute name="level" type="String" mode="IN" optional="false"/> - <attribute name="additivity" type="String" mode="IN" optional="true"/> - </service> <service name="displayXaDebugInfo" engine="java" location="org.ofbiz.common.CommonServices" invoke="displayXaDebugInfo" auth="true"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonServices.java Wed Aug 27 08:29:10 2014 @@ -44,8 +44,6 @@ import javax.mail.internet.MimeMessage; import javolution.util.FastList; import javolution.util.FastMap; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.ofbiz.base.metrics.Metrics; import org.ofbiz.base.metrics.MetricsFactory; import org.ofbiz.base.util.Debug; @@ -220,23 +218,6 @@ public class CommonServices { return ServiceUtil.returnSuccess(); } - public static Map<String, Object> addOrUpdateLogger(DispatchContext dctc, Map<String, ?> context) { - String name = (String) context.get("name"); - String level = (String) context.get("level"); - boolean additivity = "Y".equalsIgnoreCase((String) context.get("additivity")); - - Logger logger = null; - if ("root".equals(name)) { - logger = Logger.getRootLogger(); - } else { - logger = Logger.getLogger(name); - } - logger.setLevel(Level.toLevel(level)); - logger.setAdditivity(additivity); - - return ServiceUtil.returnSuccess(); - } - public static Map<String, Object> forceGc(DispatchContext dctx, Map<String, ?> context) { System.gc(); return ServiceUtil.returnSuccess(); @@ -363,18 +344,14 @@ public class CommonServices { } public static Map<String, Object> displayXaDebugInfo(DispatchContext dctx, Map<String, ?> context) { - try { - if (TransactionUtil.debugResources()) { - if (UtilValidate.isNotEmpty(TransactionUtil.debugResMap)) { - TransactionUtil.logRunningTx(); - } else { - Debug.logInfo("No running transaction to display.", module); - } + if (TransactionUtil.debugResources()) { + if (UtilValidate.isNotEmpty(TransactionUtil.debugResMap)) { + TransactionUtil.logRunningTx(); } else { - Debug.logInfo("Debug resources is disabled.", module); + Debug.logInfo("No running transaction to display.", module); } - } catch (GenericEntityConfException e) { - return ServiceUtil.returnError(e.getMessage()); + } else { + Debug.logInfo("Debug resources is disabled.", module); } return ServiceUtil.returnSuccess(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java Wed Aug 27 08:29:10 2014 @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRes import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.DelegatorFactory; @@ -50,8 +49,8 @@ public class UrlServletHelper extends Co public static void setRequestAttributes(ServletRequest request, Delegator delegator, ServletContext servletContext) { HttpServletRequest httpRequest = (HttpServletRequest) request; // check if multi tenant is enabled - String useMultitenant = UtilProperties.getPropertyValue("general.properties", "multitenant"); - if ("Y".equals(useMultitenant)) { + boolean useMultitenant = EntityUtil.isMultiTenantEnabled(); + if (useMultitenant) { // get tenant delegator by domain name String serverName = request.getServerName(); try { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml Wed Aug 27 08:29:10 2014 @@ -32,7 +32,7 @@ access. For a detailed description see t <!-- Use this one for getting the JTA objects from JNDI --> <!-- NOTE: to use the JndiFactory you must specify the necessary JNDI properties - <transaction-factory class="org.ofbiz.entity.transaction.JNDIFactory"> + <transaction-factory class="org.ofbiz.entity.transaction.JNDITransactionFactory"> <user-transaction-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> <transaction-manager-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> </transaction-factory> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd Wed Aug 27 08:29:10 2014 @@ -24,7 +24,7 @@ under the License. <xs:sequence> <xs:element maxOccurs="unbounded" ref="resource-loader"/> <xs:element ref="transaction-factory"/> - <xs:element ref="connection-factory"/> + <xs:element minOccurs="0" ref="connection-factory"/> <xs:element ref="debug-xa-resources"/> <xs:element maxOccurs="unbounded" ref="delegator"/> <xs:element maxOccurs="unbounded" ref="entity-model-reader"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed Aug 27 08:29:10 2014 @@ -52,9 +52,9 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.cache.Cache; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.config.EntityConfigUtil; import org.ofbiz.entity.config.model.Datasource; import org.ofbiz.entity.config.model.DelegatorElement; +import org.ofbiz.entity.config.model.EntityConfig; import org.ofbiz.entity.datasource.GenericHelper; import org.ofbiz.entity.datasource.GenericHelperFactory; import org.ofbiz.entity.datasource.GenericHelperInfo; @@ -210,7 +210,7 @@ public class GenericDelegator implements protected GenericDelegator(String delegatorFullName) throws GenericEntityException { //if (Debug.infoOn()) Debug.logInfo("Creating new Delegator with name \"" + delegatorFullName + "\".", module); this.setDelegatorNames(delegatorFullName); - this.delegatorInfo = EntityConfigUtil.getDelegator(delegatorBaseName); + this.delegatorInfo = EntityConfig.getInstance().getDelegator(delegatorBaseName); String kekText; // before continuing, if there is a tenantId use the base delegator to see if it is valid @@ -282,7 +282,7 @@ public class GenericDelegator implements GenericHelper helper = GenericHelperFactory.getHelper(helperInfo); try { - Datasource datasource = EntityConfigUtil.getDatasource(helperBaseName); + Datasource datasource = EntityConfig.getDatasource(helperBaseName); if (datasource.getCheckOnStart()) { if (Debug.infoOn()) { Debug.logInfo("Doing database check as requested in entityengine.xml with addMissing=" + datasource.getAddMissingOnStart(), module); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ConnectionFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ConnectionFactory.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ConnectionFactory.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ConnectionFactory.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -34,7 +33,7 @@ public final class ConnectionFactory { private final String className; // type = xs:string ConnectionFactory(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String className = element.getAttribute("class").intern(); if (className.isEmpty()) { throw new GenericEntityConfException("<connection-factory> element class attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Datasource.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Datasource.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Datasource.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/Datasource.java Wed Aug 27 08:29:10 2014 @@ -25,7 +25,6 @@ import java.util.List; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -83,7 +82,7 @@ public final class Datasource { private final TyrexDataSource tyrexDataSource; // <tyrex-dataSource> Datasource(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<datasource> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DebugXaResources.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DebugXaResources.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DebugXaResources.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DebugXaResources.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -34,7 +33,7 @@ public final class DebugXaResources { private final boolean value; // type = xs:string DebugXaResources(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String value = element.getAttribute("value").intern(); if (value.isEmpty()) { throw new GenericEntityConfException("<debug-xa-resources> element value attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DelegatorElement.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DelegatorElement.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DelegatorElement.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/DelegatorElement.java Wed Aug 27 08:29:10 2014 @@ -27,7 +27,6 @@ import java.util.HashMap; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -54,7 +53,7 @@ public final class DelegatorElement { private final Map<String, String> groupMapMap; // <group-map> DelegatorElement(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<delegator> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java Wed Aug 27 08:29:10 2014 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.entity.config.model; +import java.net.URL; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -25,18 +26,25 @@ import java.util.Map; import java.util.HashMap; import org.ofbiz.base.lang.ThreadSafe; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.UtilURL; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; import org.w3c.dom.Element; /** - * An object that models the <code><entity-config></code> element. + * A singleton class that models the <code><entity-config></code> element. * * @see <code>entity-config.xsd</code> */ @ThreadSafe public final class EntityConfig { + public static final String ENTITY_ENGINE_XML_FILENAME = "entityengine.xml"; + private static final String module = EntityConfig.class.getName(); + + private static final EntityConfig instance = createNewInstance(); private final List<ResourceLoader> resourceLoaderList; // <resource-loader> private final Map<String, ResourceLoader> resourceLoaderMap; // <resource-loader> private final TransactionFactory transactionFactory; // <transaction-factory> @@ -57,7 +65,18 @@ public final class EntityConfig { private final List<Datasource> datasourceList; // <datasource> private final Map<String, Datasource> datasourceMap; - public EntityConfig(Element element) throws GenericEntityConfException { + private EntityConfig() throws GenericEntityConfException { + Element element; + URL confUrl = UtilURL.fromResource(ENTITY_ENGINE_XML_FILENAME); + if (confUrl == null) { + throw new GenericEntityConfException("Could not find the " + ENTITY_ENGINE_XML_FILENAME + " file"); + } + try { + element = UtilXml.readXmlDocument(confUrl, true, true).getDocumentElement(); + } catch (Exception e) { + throw new GenericEntityConfException("Exception thrown while reading " + ENTITY_ENGINE_XML_FILENAME + ": ", e); + } + List<? extends Element> resourceLoaderElementList = UtilXml.childElementList(element, "resource-loader"); if (resourceLoaderElementList.isEmpty()) { throw new GenericEntityConfException("<entity-config> element child elements <resource-loader> are missing"); @@ -79,10 +98,10 @@ public final class EntityConfig { this.transactionFactory = new TransactionFactory(transactionFactoryElement); } Element connectionFactoryElement = UtilXml.firstChildElement(element, "connection-factory"); - if (connectionFactoryElement == null) { - throw new GenericEntityConfException("<entity-config> element child element <connection-factory> is missing"); - } else { + if (connectionFactoryElement != null) { this.connectionFactory = new ConnectionFactory(connectionFactoryElement); + } else { + this.connectionFactory = null; } Element debugXaResourcesElement = UtilXml.firstChildElement(element, "debug-xa-resources"); if (debugXaResourcesElement == null) { @@ -192,6 +211,30 @@ public final class EntityConfig { } } + private static EntityConfig createNewInstance() { + EntityConfig entityConfig = null; + try { + entityConfig = new EntityConfig(); + } catch (GenericEntityConfException gece) { + Debug.logError(gece, module); + } + return entityConfig; + } + + public static EntityConfig getInstance() throws GenericEntityConfException { + if (instance == null) { + throw new GenericEntityConfException("EntityConfig is not initialized."); + } + return instance; + } + + public static String createConfigFileLineNumberText(Element element) { + if (element.getUserData("startLine") != null) { + return " [" + ENTITY_ENGINE_XML_FILENAME + " line " + element.getUserData("startLine") + "]"; + } + return ""; + } + /** Returns the specified <code><resource-loader></code> child element, or <code>null</code> if no child element was found. */ public ResourceLoader getResourceLoader(String name) { return this.resourceLoaderMap.get(name); @@ -283,9 +326,45 @@ public final class EntityConfig { } /** Returns the specified <code><datasource></code> child element or <code>null</code> if it does not exist. */ + /* public Datasource getDatasource(String name) { return this.datasourceMap.get(name); } + */ + public static Datasource getDatasource(String name) { + try { + return getInstance().datasourceMap.get(name); + } catch (GenericEntityConfException e) { + // FIXME: Doing this so we don't have to rewrite the entire API. + throw new RuntimeException(e); + } + } + + /** + * Returns the configured JDBC password. + * + * @param inlineJdbcElement + * @return The configured JDBC password. + * @throws GenericEntityConfException If the password was not found. + * + * @see <code>entity-config.xsd</code> + */ + public static String getJdbcPassword(InlineJdbc inlineJdbcElement) throws GenericEntityConfException { + String jdbcPassword = inlineJdbcElement.getJdbcPassword(); + if (!jdbcPassword.isEmpty()) { + return jdbcPassword; + } + String jdbcPasswordLookup = inlineJdbcElement.getJdbcPasswordLookup(); + if (jdbcPasswordLookup.isEmpty()) { + throw new GenericEntityConfException("No jdbc-password or jdbc-password-lookup specified for inline-jdbc element, line: " + inlineJdbcElement.getLineNumber()); + } + String key = "jdbc-password.".concat(jdbcPasswordLookup); + jdbcPassword = UtilProperties.getPropertyValue("passwords.properties", key); + if (jdbcPassword.isEmpty()) { + throw new GenericEntityConfException("'" + key + "' property not found in passwords.properties file for inline-jdbc element, line: " + inlineJdbcElement.getLineNumber()); + } + return jdbcPassword; + } /** Returns the <code><datasource></code> child elements as a <code>Map</code>. */ public Map<String, Datasource> getDatasourceMap() { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityDataReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityDataReader.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityDataReader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityDataReader.java Wed Aug 27 08:29:10 2014 @@ -25,7 +25,6 @@ import java.util.List; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -48,7 +47,7 @@ public final class EntityDataReader { } EntityDataReader(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<entity-data-reader> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityEcaReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityEcaReader.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityEcaReader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityEcaReader.java Wed Aug 27 08:29:10 2014 @@ -25,7 +25,6 @@ import java.util.List; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -40,7 +39,7 @@ public final class EntityEcaReader { private final List<Resource> resourceList; // <resource> EntityEcaReader(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<entity-eca-reader> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityGroupReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityGroupReader.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityGroupReader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityGroupReader.java Wed Aug 27 08:29:10 2014 @@ -25,7 +25,6 @@ import java.util.List; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -42,7 +41,7 @@ public final class EntityGroupReader { private final List<Resource> resourceList; // <resource> EntityGroupReader(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<entity-group-reader> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityModelReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityModelReader.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityModelReader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/EntityModelReader.java Wed Aug 27 08:29:10 2014 @@ -25,7 +25,6 @@ import java.util.List; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -40,7 +39,7 @@ public final class EntityModelReader { private final List<Resource> resourceList; // <resource> EntityModelReader(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<entity-model-reader> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/FieldType.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/FieldType.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/FieldType.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/FieldType.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -36,7 +35,7 @@ public final class FieldType { private final String location; // type = xs:string FieldType(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String name = element.getAttribute("name").intern(); if (name.isEmpty()) { throw new GenericEntityConfException("<field-type> element name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/GroupMap.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/GroupMap.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/GroupMap.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/GroupMap.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -35,7 +34,7 @@ public final class GroupMap { private final String datasourceName; // type = xs:string GroupMap(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String groupName = element.getAttribute("group-name").intern(); if (groupName.isEmpty()) { throw new GenericEntityConfException("<group-map> element group-name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -54,7 +53,7 @@ public final class InlineJdbc extends Jd InlineJdbc(Element element) throws GenericEntityConfException { super(element); - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String jdbcDriver = element.getAttribute("jdbc-driver").intern(); if (jdbcDriver.isEmpty()) { throw new GenericEntityConfException("<inline-jdbc> element jdbc-driver attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/JndiJdbc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/JndiJdbc.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/JndiJdbc.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/JndiJdbc.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -36,7 +35,7 @@ public final class JndiJdbc extends Jdbc JndiJdbc(Element element) throws GenericEntityConfException { super(element); - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String jndiServerName = element.getAttribute("jndi-server-name").intern(); if (jndiServerName.isEmpty()) { throw new GenericEntityConfException("<jndi-jdbc> element jndi-server-name attribute is empty" + lineNumberText); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ReadData.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ReadData.java?rev=1620803&r1=1620802&r2=1620803&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ReadData.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/ReadData.java Wed Aug 27 08:29:10 2014 @@ -20,7 +20,6 @@ package org.ofbiz.entity.config.model; import org.ofbiz.base.lang.ThreadSafe; import org.ofbiz.entity.GenericEntityConfException; -import org.ofbiz.entity.config.EntityConfigUtil; import org.w3c.dom.Element; /** @@ -34,7 +33,7 @@ public final class ReadData { private final String readerName; // type = xs:string ReadData(Element element) throws GenericEntityConfException { - String lineNumberText = EntityConfigUtil.createConfigFileLineNumberText(element); + String lineNumberText = EntityConfig.createConfigFileLineNumberText(element); String readerName = element.getAttribute("reader-name").intern(); if (readerName.isEmpty()) { throw new GenericEntityConfException("<read-data> element reader-name attribute is empty" + lineNumberText); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |