Author: painter Date: Mon Oct 8 15:02:14 2018 New Revision: 1843162 URL: http://svn.apache.org/viewvc?rev=1843162&view=rev Log: Fix references to commons-config 2 and torque criteria objects
Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java turbine/core/trunk/extensions/torque/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java turbine/core/trunk/proposals/seade/SystemProperties/org/apache/turbine/services/systemproperties/TurbineSystemPropertiesService.java turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java turbine/core/trunk/proposals/tv/osgi/service/test/org/apache/turbine/services/osgi/TurbineOSGiComponentServiceTest.java Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java Mon Oct 8 15:02:14 2018 @@ -24,7 +24,7 @@ import java.util.Vector; import javax.servlet.ServletConfig; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java Mon Oct 8 15:02:14 2018 @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.torque.TorqueException; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; import org.apache.turbine.services.InitializationException; import org.apache.turbine.services.TurbineBaseService; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java Mon Oct 8 15:02:14 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac import org.apache.torque.TorqueException; import org.apache.torque.om.Persistent; import org.apache.torque.util.BasePeer; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; import org.apache.turbine.om.security.Group; import org.apache.turbine.services.InitializationException; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java Mon Oct 8 15:02:14 2018 @@ -27,7 +27,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Vector; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,7 +43,7 @@ import org.apache.turbine.util.security. import org.apache.torque.TorqueException; import org.apache.torque.om.Persistent; import org.apache.torque.util.BasePeer; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; /** * This class capsulates all direct Peer access for the Permission entities. Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java Mon Oct 8 15:02:14 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +42,7 @@ import org.apache.turbine.util.security. import org.apache.torque.TorqueException; import org.apache.torque.om.Persistent; import org.apache.torque.util.BasePeer; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; /** * This class capsulates all direct Peer access for the Role entities. Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java Mon Oct 8 15:02:14 2018 @@ -24,7 +24,7 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac import org.apache.torque.om.NumberKey; import org.apache.torque.om.Persistent; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; import org.apache.turbine.om.security.Group; import org.apache.turbine.om.security.Permission; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java Mon Oct 8 15:02:14 2018 @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.torque.om.Persistent; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; import org.apache.turbine.om.security.User; import org.apache.turbine.services.InitializationException; Modified: turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java (original) +++ turbine/core/trunk/extensions/torque/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java Mon Oct 8 15:02:14 2018 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac import org.apache.torque.TorqueException; import org.apache.torque.om.Persistent; import org.apache.torque.util.BasePeer; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; import org.apache.turbine.om.security.User; import org.apache.turbine.services.InitializationException; Modified: turbine/core/trunk/extensions/torque/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/extensions/torque/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/extensions/torque/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java (original) +++ turbine/core/trunk/extensions/torque/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java Mon Oct 8 15:02:14 2018 @@ -24,7 +24,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.turbine.modules.scheduledjob.SimpleJob; import org.apache.turbine.services.ServiceManager; Modified: turbine/core/trunk/proposals/seade/SystemProperties/org/apache/turbine/services/systemproperties/TurbineSystemPropertiesService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/seade/SystemProperties/org/apache/turbine/services/systemproperties/TurbineSystemPropertiesService.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/proposals/seade/SystemProperties/org/apache/turbine/services/systemproperties/TurbineSystemPropertiesService.java (original) +++ turbine/core/trunk/proposals/seade/SystemProperties/org/apache/turbine/services/systemproperties/TurbineSystemPropertiesService.java Mon Oct 8 15:02:14 2018 @@ -21,7 +21,7 @@ package org.apache.turbine.services.syst import java.util.Iterator; import java.util.Properties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.turbine.services.InitializationException; Modified: turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java (original) +++ turbine/core/trunk/proposals/tv/osgi/service/java/org/apache/turbine/services/osgi/TurbineOSGiComponentService.java Mon Oct 8 15:02:14 2018 @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: turbine/core/trunk/proposals/tv/osgi/service/test/org/apache/turbine/services/osgi/TurbineOSGiComponentServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/proposals/tv/osgi/service/test/org/apache/turbine/services/osgi/TurbineOSGiComponentServiceTest.java?rev=1843162&r1=1843161&r2=1843162&view=diff ============================================================================== --- turbine/core/trunk/proposals/tv/osgi/service/test/org/apache/turbine/services/osgi/TurbineOSGiComponentServiceTest.java (original) +++ turbine/core/trunk/proposals/tv/osgi/service/test/org/apache/turbine/services/osgi/TurbineOSGiComponentServiceTest.java Mon Oct 8 15:02:14 2018 @@ -24,7 +24,7 @@ package org.apache.turbine.services.osgi import java.lang.reflect.Method; import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.turbine.services.ServiceManager; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.test.BaseTestCase;