Scarab commit: svn commit: r11247 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om

Author: mcoss
Date: 2012-05-04 07:41:35-0700
New Revision: 11247

Modified:
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java

Log:
CHG - import org.apache.turbine.services.security.impl.db.entity. (was -> org.apache.fulcrum.security.impl.db.entity.) -> org.apache.turbine.services.security.torque.om.

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java?view=diff&pathrev=11247&r1=11246&r2=11247
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/AttributeGroup.java	2012-05-04 07:41:35-0700
@@ -56,7 +56,7 @@
 import org.apache.turbine.services.security.TurbineSecurity;
 import org.apache.turbine.om.security.Group;
 import org.apache.turbine.om.security.Role;
-import org.apache.turbine.services.security.impl.db.entity.TurbineRolePeer;
+import org.apache.turbine.services.security.torque.om.TurbineRolePeer;
 import org.apache.turbine.util.security.AccessControlList;
 import org.apache.turbine.util.security.DataBackendException;
 import org.apache.turbine.util.security.GroupSet;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&pathrev=11247&r1=11246&r2=11247
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java	2012-05-04 07:41:35-0700
@@ -100,7 +100,7 @@
     .TurbineUserGroupRolePeer;
 import org.apache.turbine.services.security.impl.db.entity
     .TurbineRolePermissionPeer;
-import org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer;
+import org.apache.turbine.services.security.torque.om.TurbineUserPeer;
 import org.tigris.scarab.util.ScarabRuntimeException;
 
 /**

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&pathrev=11247&r1=11246&r2=11247
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java	2012-05-04 07:41:35-0700
@@ -67,10 +67,10 @@
 import org.apache.turbine.om.security.Group;
 import org.apache.turbine.om.security.Role;
 import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.impl.db.entity.TurbinePermissionPeer;
-import org.apache.turbine.services.security.impl.db.entity.TurbineRolePeer;
-import org.apache.turbine.services.security.impl.db.entity.TurbineRolePermissionPeer;
-import org.apache.turbine.services.security.impl.db.entity.TurbineUserGroupRolePeer;
+import org.apache.turbine.services.security.torque.om.TurbinePermissionPeer;
+import org.apache.turbine.services.security.torque.om.TurbineRolePeer;
+import org.apache.turbine.services.security.torque.om.TurbineRolePermissionPeer;
+import org.apache.turbine.services.security.torque.om.TurbineUserGroupRolePeer;
 import org.apache.turbine.util.security.AccessControlList;
 import org.apache.turbine.util.security.DataBackendException;
 import org.apache.turbine.util.security.EntityExistsException;

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java?view=diff&pathrev=11247&r1=11246&r2=11247
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/Transition.java	2012-05-04 07:41:35-0700
@@ -51,7 +51,7 @@
 import java.util.List;
 
 import org.apache.turbine.om.security.Role;
-import org.apache.turbine.services.security.impl.db.entity.TurbineRolePeer;
+import org.apache.turbine.services.security.torque.om.TurbineRolePeer;
 import org.apache.torque.NoRowsException;
 import org.apache.torque.TooManyRowsException;
 import org.apache.torque.TorqueException;

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957669