svn commit: r1804953 [3/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1804953 [3/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.entity.transaction; -import javax.transaction.xa.Xid; import javax.transaction.xa.XAException; +import javax.transaction.xa.Xid; import org.apache.ofbiz.base.util.Debug; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java Mon Aug 14 08:32:21 2017 @@ -18,16 +18,16 @@ *******************************************************************************/ package org.apache.ofbiz.entity.transaction; -import org.apache.ofbiz.base.util.Debug; - import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; +import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import javax.transaction.xa.XAException; + +import org.apache.ofbiz.base.util.Debug; /** * GenericXaResource - Abstract XA Resource implementation supporting a single transaction Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java Mon Aug 14 08:32:21 2017 @@ -37,7 +37,9 @@ import org.apache.ofbiz.base.util.Genera import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.config.model.*; +import org.apache.ofbiz.entity.config.model.Datasource; +import org.apache.ofbiz.entity.config.model.EntityConfig; +import org.apache.ofbiz.entity.config.model.JndiJdbc; import org.apache.ofbiz.entity.datasource.GenericHelperInfo; import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java Mon Aug 14 08:32:21 2017 @@ -20,6 +20,7 @@ package org.apache.ofbiz.entity.transact import java.sql.Connection; import java.sql.SQLException; + import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java Mon Aug 14 08:32:21 2017 @@ -28,11 +28,6 @@ import java.util.concurrent.ConcurrentHa import java.util.concurrent.ConcurrentMap; import org.apache.commons.codec.binary.Base64; -import org.apache.shiro.crypto.AesCipherService; -import org.apache.shiro.crypto.OperationMode; -import org.apache.shiro.crypto.hash.DefaultHashService; -import org.apache.shiro.crypto.hash.HashRequest; -import org.apache.shiro.crypto.hash.HashService; import org.apache.ofbiz.base.crypto.DesCrypt; import org.apache.ofbiz.base.crypto.HashCrypt; import org.apache.ofbiz.base.util.Debug; @@ -46,6 +41,11 @@ import org.apache.ofbiz.entity.GenericEn import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.model.ModelField.EncryptMethod; import org.apache.ofbiz.entity.transaction.TransactionUtil; +import org.apache.shiro.crypto.AesCipherService; +import org.apache.shiro.crypto.OperationMode; +import org.apache.shiro.crypto.hash.DefaultHashService; +import org.apache.shiro.crypto.hash.HashRequest; +import org.apache.shiro.crypto.hash.HashService; public final class EntityCrypto { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java Mon Aug 14 08:32:21 2017 @@ -22,7 +22,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -40,7 +39,6 @@ import org.apache.ofbiz.entity.GenericPK import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.condition.EntityCondition; import org.apache.ofbiz.entity.model.DynamicViewEntity; -import org.apache.ofbiz.entity.model.ModelEntity; /** * Used to setup various options for and subsequently execute entity queries. Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java Mon Aug 14 08:32:21 2017 @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java Mon Aug 14 08:32:21 2017 @@ -18,6 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.entity; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import org.apache.ofbiz.base.util.Debug; import org.junit.After; import org.junit.Before; @@ -25,8 +32,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; - public class DelegatorUnitTests { private boolean logErrorOn; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java Mon Aug 14 08:32:21 2017 @@ -18,6 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.entity.util; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericValue; @@ -26,9 +32,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - public class EntitySaxReaderTests { private boolean logVerboseOn; Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java Mon Aug 14 08:32:21 2017 @@ -19,13 +19,13 @@ package org.apache.ofbiz.entityext.eca; -import org.w3c.dom.Element; -import org.apache.ofbiz.base.util.UtilValidate; +import java.util.Map; + import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.entity.model.ModelUtil; - -import java.util.Map; +import org.w3c.dom.Element; /** * ServiceEcaSetField Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.minilang; -import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.minilang.method.MethodContext; import org.w3c.dom.Element; Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java Mon Aug 14 08:32:21 2017 @@ -21,10 +21,6 @@ package org.apache.ofbiz.minilang.method import java.util.Collections; import java.util.List; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.PatternFactory; import org.apache.ofbiz.base.util.UtilXml; @@ -38,6 +34,10 @@ import org.apache.ofbiz.minilang.SimpleM import org.apache.ofbiz.minilang.artifact.ArtifactInfoContext; import org.apache.ofbiz.minilang.method.MethodContext; import org.apache.ofbiz.minilang.method.MethodOperation; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java Mon Aug 14 08:32:21 2017 @@ -22,14 +22,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; import org.apache.ofbiz.base.util.PatternFactory; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java Mon Aug 14 08:32:21 2017 @@ -23,15 +23,15 @@ import java.util.Map; import javax.transaction.Transaction; -import org.apache.ofbiz.service.calendar.RecurrenceRule; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.transaction.GenericTransactionException; import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.security.Security; +import org.apache.ofbiz.service.calendar.RecurrenceRule; import org.apache.ofbiz.service.jms.JmsListenerFactory; import org.apache.ofbiz.service.job.JobManager; import org.apache.ofbiz.service.job.JobManagerException; -import org.apache.ofbiz.base.util.Debug; /** * Generic Services Local Dispatcher Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.service; -import java.util.Map; import java.io.Serializable; +import java.util.Map; /** * Generic Requester Interface Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.service; -import java.util.List; import java.util.ArrayList; +import java.util.List; import org.apache.ofbiz.base.util.UtilValidate; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java Mon Aug 14 08:32:21 2017 @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.util.ArrayList; -import com.ibm.icu.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.Iterator; @@ -28,11 +27,12 @@ import java.util.List; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.service.calendar.TemporalExpression; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; +import com.ibm.icu.util.Calendar; + /** * Recurrence Info Object */ Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java Mon Aug 14 08:32:21 2017 @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.util.Arrays; -import com.ibm.icu.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -31,6 +30,8 @@ import org.apache.ofbiz.entity.Delegator import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; +import com.ibm.icu.util.Calendar; + /** * Recurrence Rule Object */ Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java Mon Aug 14 08:32:21 2017 @@ -19,11 +19,12 @@ package org.apache.ofbiz.service.calendar; import java.io.Serializable; -import com.ibm.icu.util.Calendar; import java.util.Date; import java.util.Set; import java.util.TreeSet; +import com.ibm.icu.util.Calendar; + /** Temporal expression abstract class. */ @SuppressWarnings("serial") public abstract class TemporalExpression implements Serializable, Comparable<TemporalExpression> { Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java Mon Aug 14 08:32:21 2017 @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.calendar; import java.io.Serializable; -import com.ibm.icu.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.Set; @@ -27,6 +26,8 @@ import java.util.TreeSet; import org.apache.ofbiz.base.util.Debug; +import com.ibm.icu.util.Calendar; + /** A collection of TemporalExpression classes. * <p>For the most part, these classes are immutable - with the exception * of the <code>id</code> field. The basic idea is to construct an expression Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java Mon Aug 14 08:32:21 2017 @@ -19,7 +19,6 @@ package org.apache.ofbiz.service.engine; import static org.apache.ofbiz.base.util.UtilGenerics.cast; -import groovy.lang.Script; import java.util.Collections; import java.util.HashMap; @@ -29,7 +28,6 @@ import java.util.Set; import javax.script.ScriptContext; -import org.codehaus.groovy.runtime.InvokerHelper; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.ScriptHelper; @@ -40,6 +38,9 @@ import org.apache.ofbiz.service.GenericS import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceDispatcher; import org.apache.ofbiz.service.ServiceUtil; +import org.codehaus.groovy.runtime.InvokerHelper; + +import groovy.lang.Script; /** * Groovy Script Service Engine Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java Mon Aug 14 08:32:21 2017 @@ -23,12 +23,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Map; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceDispatcher; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilGenerics; /** * Standard Java Static Method Service Engine Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java Mon Aug 14 08:32:21 2017 @@ -24,8 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.Debug; @@ -39,6 +37,8 @@ import org.apache.ofbiz.service.ServiceD import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; /** * Engine For XML RPC CLient Configuration management Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java Mon Aug 14 08:32:21 2017 @@ -18,9 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.service.group; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.*; +import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java Mon Aug 14 08:32:21 2017 @@ -28,11 +28,11 @@ import javax.jms.Session; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.service.GenericServiceException; /** * JmsQueueListener - Queue (P2P) Message Listener. Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java Mon Aug 14 08:32:21 2017 @@ -28,11 +28,11 @@ import javax.jms.TopicSubscriber; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.JNDIContextFactory; import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.service.GenericServiceException; /** * JmsTopicListener - Topic (Pub/Sub) Message Listener. Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java Mon Aug 14 08:32:21 2017 @@ -37,8 +37,8 @@ import org.apache.ofbiz.base.config.Gene import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.Assert; import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.config.ServiceConfigListener; +import org.apache.ofbiz.service.config.ServiceConfigUtil; import org.apache.ofbiz.service.config.model.ServiceConfig; import org.apache.ofbiz.service.config.model.ThreadPool; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java Mon Aug 14 08:32:21 2017 @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.service.rmi; -import java.util.Map; import java.rmi.Remote; import java.rmi.RemoteException; +import java.util.Map; import org.apache.ofbiz.service.GenericRequester; import org.apache.ofbiz.service.GenericResultWaiter; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java Mon Aug 14 08:32:21 2017 @@ -24,11 +24,12 @@ import java.io.Serializable; import java.net.Socket; import java.rmi.server.RMIClientSocketFactory; import java.security.GeneralSecurityException; + import javax.net.ssl.SSLSocketFactory; +import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.SSLUtil; -import org.apache.ofbiz.base.config.GenericConfigException; /** * RMI SSL Client Socket Factory Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java Mon Aug 14 08:32:21 2017 @@ -22,10 +22,10 @@ package org.apache.ofbiz.service.test; import java.net.MalformedURLException; import java.net.URL; -import junit.framework.TestCase; - -import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.ofbiz.service.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; + +import junit.framework.TestCase; /** * AbstractXmlRpcTestCase Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java Mon Aug 14 08:32:21 2017 @@ -22,7 +22,6 @@ package org.apache.ofbiz.service.test; import java.util.Locale; import java.util.Map; -import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.ofbiz.base.start.Start; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilProperties; @@ -31,6 +30,7 @@ import org.apache.ofbiz.service.Dispatch import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.xmlrpc.client.XmlRpcClient; /** * XmlRpcTests */ Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java Mon Aug 14 08:32:21 2017 @@ -29,6 +29,8 @@ import java.security.KeyStore; import javax.net.ssl.HttpsURLConnection; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.SSLUtil; import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcRequest; import org.apache.xmlrpc.client.XmlRpcClientException; @@ -38,8 +40,6 @@ import org.apache.xmlrpc.client.XmlRpcTr import org.apache.xmlrpc.client.XmlRpcTransportFactoryImpl; import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig; import org.apache.xmlrpc.util.HttpUtil; -import org.apache.ofbiz.base.util.GeneralException; -import org.apache.ofbiz.base.util.SSLUtil; import org.xml.sax.SAXException; /** Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java Mon Aug 14 08:32:21 2017 @@ -19,13 +19,13 @@ package org.apache.ofbiz.service.xmlrpc; -import org.apache.xmlrpc.client.XmlRpcClientConfig; -import org.apache.xmlrpc.client.XmlRpcTransportFactory; +import java.security.KeyStore; + import org.apache.ofbiz.base.component.ComponentConfig; -import org.apache.ofbiz.base.util.KeyStoreUtil; import org.apache.ofbiz.base.util.Debug; - -import java.security.KeyStore; +import org.apache.ofbiz.base.util.KeyStoreUtil; +import org.apache.xmlrpc.client.XmlRpcClientConfig; +import org.apache.xmlrpc.client.XmlRpcTransportFactory; /** * XmlRpcClient Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java Mon Aug 14 08:32:21 2017 @@ -1,14 +1,14 @@ package org.apache.ofbiz.base.start; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; - public class OfbizStartupUnitTests { @Rule Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java Mon Aug 14 08:32:21 2017 @@ -22,9 +22,6 @@ import java.net.URL; import java.util.LinkedList; import java.util.List; -import junit.framework.AssertionFailedError; -import junit.framework.TestResult; - import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; @@ -33,6 +30,9 @@ import org.apache.ofbiz.entity.util.Enti import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.AssertionFailedError; +import junit.framework.TestResult; + public class EntityXmlAssertTest extends OFBizTestCase { public static final String module = ServiceTest.class.getName(); Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java Mon Aug 14 08:32:21 2017 @@ -21,9 +21,6 @@ package org.apache.ofbiz.testtools; import java.util.LinkedList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.ofbiz.base.component.ComponentConfig; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.config.ResourceHandler; @@ -31,6 +28,9 @@ import org.apache.ofbiz.base.util.Debug; import org.w3c.dom.Document; import org.w3c.dom.Element; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Use this class in a JUnit test runner to prepare the TestSuite. */ Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java Mon Aug 14 08:32:21 2017 @@ -23,10 +23,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.lang.RandomStringUtils; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.ObjectType; @@ -44,6 +40,10 @@ import org.apache.ofbiz.service.ServiceC import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Use this class in a JUnit test runner to bootstrap the Test Suite runner. */ Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java Mon Aug 14 08:32:21 2017 @@ -21,9 +21,6 @@ package org.apache.ofbiz.testtools; import java.util.List; import java.util.Map; -import junit.framework.AssertionFailedError; -import junit.framework.TestResult; - import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; @@ -32,6 +29,9 @@ import org.apache.ofbiz.service.ModelSer import org.apache.ofbiz.service.testtools.OFBizTestCase; import org.w3c.dom.Element; +import junit.framework.AssertionFailedError; +import junit.framework.TestResult; + public class ServiceTest extends OFBizTestCase { public static final String module = ServiceTest.class.getName(); Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java Mon Aug 14 08:32:21 2017 @@ -27,6 +27,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ofbiz.base.container.Container; +import org.apache.ofbiz.base.container.ContainerException; +import org.apache.ofbiz.base.container.StartupCommandToArgsAdapter; +import org.apache.ofbiz.base.start.StartupCommand; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.entity.Delegator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest; +import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter; + import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; @@ -35,16 +45,6 @@ import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest; -import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter; -import org.apache.ofbiz.base.container.Container; -import org.apache.ofbiz.base.container.ContainerException; -import org.apache.ofbiz.base.container.StartupCommandToArgsAdapter; -import org.apache.ofbiz.base.start.StartupCommand; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.entity.Delegator; - /** * A Container implementation to run the tests configured through this testtools stuff. */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java Mon Aug 14 08:32:21 2017 @@ -25,10 +25,18 @@ import java.io.InputStream; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import javax.servlet.ServletContext; import javax.servlet.ServletRequest; +import org.apache.ofbiz.base.component.ComponentConfig; +import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo; +import org.apache.ofbiz.base.util.Assert; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilXml.LocalErrorHandler; +import org.apache.ofbiz.base.util.UtilXml.LocalResolver; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.DelegatorFactory; import org.apache.ofbiz.security.Security; @@ -37,19 +45,11 @@ import org.apache.ofbiz.security.Securit import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceContainer; import org.apache.ofbiz.webapp.event.RequestBodyMapHandlerFactory; -import org.apache.ofbiz.base.component.ComponentConfig; -import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo; -import org.apache.ofbiz.base.util.Assert; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilXml.LocalErrorHandler; -import org.apache.ofbiz.base.util.UtilXml.LocalResolver; -import org.apache.ofbiz.base.util.cache.UtilCache; - -import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.descriptor.DigesterFactory; import org.apache.tomcat.util.descriptor.web.ServletDef; import org.apache.tomcat.util.descriptor.web.WebRuleSet; import org.apache.tomcat.util.descriptor.web.WebXml; +import org.apache.tomcat.util.digester.Digester; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java Mon Aug 14 08:32:21 2017 @@ -19,8 +19,9 @@ package org.apache.ofbiz.webapp.control; import java.io.IOException; -import java.util.Set; import java.util.HashSet; +import java.util.Set; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java Mon Aug 14 08:32:21 2017 @@ -18,6 +18,14 @@ */ package org.apache.ofbiz.webapp.control; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.DelegatorFactory; @@ -25,13 +33,6 @@ import org.apache.ofbiz.entity.GenericVa import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.webapp.WebAppUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - /** * This class manages the authentication tokens that provide single sign-on authentication to the OFBiz applications. */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java Mon Aug 14 08:32:21 2017 @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.event; -import org.apache.commons.fileupload.ProgressListener; - import java.io.Serializable; +import org.apache.commons.fileupload.ProgressListener; + /** * FileUploadProgressListener - Commons FileUpload progress listener */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,6 @@ */ package org.apache.ofbiz.webapp.event; -import groovy.lang.Script; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -32,7 +30,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.codehaus.groovy.runtime.InvokerHelper; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.ScriptHelper; @@ -44,6 +41,9 @@ import org.apache.ofbiz.entity.transacti import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.codehaus.groovy.runtime.InvokerHelper; + +import groovy.lang.Script; public class GroovyEventHandler implements EventHandler { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,14 @@ */ package org.apache.ofbiz.webapp.event; -import org.apache.ofbiz.base.lang.JSON; -import org.apache.ofbiz.base.util.UtilGenerics; - -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.Map; +import javax.servlet.ServletRequest; + +import org.apache.ofbiz.base.lang.JSON; +import org.apache.ofbiz.base.util.UtilGenerics; + /** An implementation of <code>RequestBodyMapHandler</code> that can extract a <code>Map<String, Object></code> from the JSON data in the request body */ public class JSONRequestBodyMapHandler implements RequestBodyMapHandler { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java Mon Aug 14 08:32:21 2017 @@ -18,10 +18,11 @@ */ package org.apache.ofbiz.webapp.event; -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.Map; +import javax.servlet.ServletRequest; + /** An handler that can extract a Map (typically used as a service input map) from the data in the body of a <code>ServletRequest</code>. */ public interface RequestBodyMapHandler { /** Extracts from the data in the body of the <code>ServletRequest</code> an instance of <code>Map<String, Object></code>. Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java Mon Aug 14 08:32:21 2017 @@ -18,11 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.event; -import javax.servlet.ServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.servlet.ServletRequest; + /** Factory class that provides the proper <code>RequestBodyMapHandler</code> based on the content type of the <code>ServletRequest</code> */ public class RequestBodyMapHandlerFactory { private final static Map<String, RequestBodyMapHandler> requestBodyMapHandlers = new HashMap<String, RequestBodyMapHandler>(); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java Mon Aug 14 08:32:21 2017 @@ -26,9 +26,9 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.webapp.control.ConfigXMLReader; -import org.apache.ofbiz.webapp.control.RequestHandler; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.apache.ofbiz.webapp.control.RequestHandler; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.FeedException; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java Mon Aug 14 08:32:21 2017 @@ -35,17 +35,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.XmlRpcHandler; -import org.apache.xmlrpc.XmlRpcRequest; -import org.apache.xmlrpc.common.ServerStreamConnection; -import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; -import org.apache.xmlrpc.common.XmlRpcHttpRequestConfigImpl; -import org.apache.xmlrpc.server.AbstractReflectiveHandlerMapping; -import org.apache.xmlrpc.server.XmlRpcHttpServer; -import org.apache.xmlrpc.server.XmlRpcHttpServerConfig; -import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; -import org.apache.xmlrpc.util.HttpUtil; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; @@ -59,6 +48,17 @@ import org.apache.ofbiz.service.ServiceU import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.XmlRpcHandler; +import org.apache.xmlrpc.XmlRpcRequest; +import org.apache.xmlrpc.common.ServerStreamConnection; +import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; +import org.apache.xmlrpc.common.XmlRpcHttpRequestConfigImpl; +import org.apache.xmlrpc.server.AbstractReflectiveHandlerMapping; +import org.apache.xmlrpc.server.XmlRpcHttpServer; +import org.apache.xmlrpc.server.XmlRpcHttpServerConfig; +import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; +import org.apache.xmlrpc.util.HttpUtil; /** * XmlRpcEventHandler Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java Mon Aug 14 08:32:21 2017 @@ -22,8 +22,13 @@ import java.io.IOException; import java.io.Writer; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilFormatOut; +import org.apache.ofbiz.base.util.UtilHttp; + import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.NumberModel; @@ -33,10 +38,6 @@ import freemarker.template.TemplateModel import freemarker.template.TemplateScalarModel; import freemarker.template.TemplateTransformModel; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilFormatOut; -import org.apache.ofbiz.base.util.UtilHttp; - /** * OfbizAmountTransform - Freemarker Transform for content links */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java Mon Aug 14 08:32:21 2017 @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; -import freemarker.cache.CacheStorage; - import org.apache.ofbiz.base.util.cache.UtilCache; +import freemarker.cache.CacheStorage; + /** * A custom cache wrapper for caching FreeMarker templates */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java Mon Aug 14 08:32:21 2017 @@ -23,8 +23,16 @@ import java.io.Writer; import java.math.BigDecimal; import java.util.Locale; import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.UtilFormatOut; +import org.apache.ofbiz.base.util.UtilHttp; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.util.EntityUtilProperties; + import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.NumberModel; @@ -34,13 +42,6 @@ import freemarker.template.TemplateModel import freemarker.template.TemplateScalarModel; import freemarker.template.TemplateTransformModel; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilFormatOut; -import org.apache.ofbiz.base.util.UtilHttp; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.util.EntityUtilProperties; - /** * OfbizCurrencyTransform - Freemarker Transform for content links */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java Mon Aug 14 08:32:21 2017 @@ -18,18 +18,19 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; +import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; + import java.io.IOException; import java.io.Writer; import java.util.Map; -import freemarker.core.Environment; -import freemarker.template.TemplateTransformModel; - import org.apache.ofbiz.base.util.Debug; -import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.template.FreeMarkerWorker; +import freemarker.core.Environment; +import freemarker.template.TemplateTransformModel; + /** * RenderWrappedTextTransform - Freemarker Transform for URLs (links) */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,17 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.ftl; -import freemarker.core.Environment; -import freemarker.ext.beans.BeanModel; -import freemarker.template.*; - import java.util.List; import java.util.Map; +import freemarker.core.Environment; +import freemarker.ext.beans.BeanModel; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; +import freemarker.template.TemplateNumberModel; +import freemarker.template.TemplateScalarModel; + /** * SetRequestAttributeMethod - Freemarker Method for setting context fields */ Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java Mon Aug 14 08:32:21 2017 @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.ftl; import java.util.List; + import javax.servlet.http.HttpServletRequest; import freemarker.core.Environment; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java Mon Aug 14 08:32:21 2017 @@ -19,14 +19,15 @@ package org.apache.ofbiz.webapp.taglib; import java.io.IOException; + import javax.servlet.http.HttpServletRequest; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.webapp.website.WebSiteWorker; import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.webapp.website.WebSiteWorker; /** * ContentUrlTag - Creates a URL string prepending the content prefix from url.properties Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java Mon Aug 14 08:32:21 2017 @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.view; import java.io.IOException; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java Mon Aug 14 08:32:21 2017 @@ -19,6 +19,7 @@ package org.apache.ofbiz.webapp.view; import java.io.IOException; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.ServletException; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java Mon Aug 14 08:32:21 2017 @@ -18,12 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.control; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import javax.servlet.FilterConfig; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import org.junit.Test; public class ControlFilterTests { @Test Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,17 @@ */ package org.apache.ofbiz.webapp.control; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.ofbiz.entity.GenericValue; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; public class ExternalLoginKeysManagerTests { @Test Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java Mon Aug 14 08:32:21 2017 @@ -23,10 +23,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.ofbiz.base.container.ContainerException; import org.apache.ofbiz.base.start.StartupCommand; import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.testtools.*; +import org.apache.ofbiz.testtools.TestRunContainer; /** * Event used to run a Junit test Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java Mon Aug 14 08:32:21 2017 @@ -18,25 +18,25 @@ *******************************************************************************/ package org.apache.ofbiz.webtools.print; -import java.util.Map; -import java.util.Locale; import java.io.IOException; -import java.io.Writer; import java.io.StringWriter; +import java.io.Writer; +import java.util.Locale; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; - -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.DispatchContext; -import org.apache.ofbiz.base.util.UtilHttp; -import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityUtilProperties; -import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.service.DispatchContext; +import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java Mon Aug 14 08:32:21 2017 @@ -28,10 +28,6 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; @@ -50,6 +46,10 @@ import org.apache.ofbiz.service.GenericS import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java Mon Aug 14 08:32:21 2017 @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.codehaus.groovy.control.CompilationFailedException; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GroovyUtil; import org.apache.ofbiz.base.util.StringUtil; @@ -52,6 +51,7 @@ import org.apache.ofbiz.service.ModelPar import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.widget.WidgetWorker; import org.apache.ofbiz.widget.renderer.FormStringRenderer; +import org.codehaus.groovy.control.CompilationFailedException; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java Mon Aug 14 08:32:21 2017 @@ -36,7 +36,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TimeZone; -import org.codehaus.groovy.control.CompilationFailedException; import org.apache.ofbiz.base.conversion.ConversionException; import org.apache.ofbiz.base.conversion.DateTimeConverters; import org.apache.ofbiz.base.conversion.DateTimeConverters.StringToTimestamp; @@ -76,6 +75,7 @@ import org.apache.ofbiz.widget.renderer. import org.apache.ofbiz.widget.renderer.FormStringRenderer; import org.apache.ofbiz.widget.renderer.MenuStringRenderer; import org.apache.ofbiz.widget.renderer.ScreenRenderer; +import org.codehaus.groovy.control.CompilationFailedException; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java Mon Aug 14 08:32:21 2017 @@ -22,12 +22,7 @@ import java.util.Map; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; -import org.apache.ofbiz.widget.model.AbstractModelCondition; import org.apache.ofbiz.widget.model.AbstractModelCondition.DefaultConditionFactory; -import org.apache.ofbiz.widget.model.ModelCondition; -import org.apache.ofbiz.widget.model.ModelConditionFactory; -import org.apache.ofbiz.widget.model.ModelConditionVisitor; -import org.apache.ofbiz.widget.model.ModelWidget; import org.w3c.dom.Element; /** Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java Mon Aug 14 08:32:21 2017 @@ -28,10 +28,6 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; @@ -50,6 +46,10 @@ import org.apache.ofbiz.service.GenericS import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; import org.w3c.dom.Element; /** |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |