mpoeschl 2003/07/28 14:59:11
Modified: src/java/org/apache/turbine/flux/modules/actions/permission
FluxPermissionAction.java
src/java/org/apache/turbine/flux/modules/actions/role
FluxRoleAction.java
src/java/org/apache/turbine/flux/modules/actions/group
FluxGroupAction.java
src/java/org/apache/turbine/flux/tools FluxTool.java
Log:
replace deprecated method calls
Revision Changes Path
1.9 +4 -4
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java
Index: FluxPermissionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FluxPermissionAction.java 28 Jul 2003 21:25:57 -0000 1.8
+++ FluxPermissionAction.java 28 Jul 2003 21:59:10 -0000 1.9
@@ -85,7 +85,7 @@
throws Exception
{
//Permission permission = new Permission();
- Permission permission = TurbineSecurity.getNewPermission(null);;
+ Permission permission = TurbineSecurity.getPermissionInstance(null);
data.getParameters().setProperties(permission);
String name = data.getParameters().getString("name");
@@ -117,7 +117,7 @@
public void doUpdate(RunData data, Context context)
throws Exception
{
- Permission permission = TurbineSecurity.getPermission(
+ Permission permission = TurbineSecurity.getPermissionByName(
data.getParameters().getString("oldname"));
try
{
@@ -142,7 +142,7 @@
public void doDelete(RunData data, Context context)
throws Exception
{
- Permission permission = TurbineSecurity.getPermission(
+ Permission permission = TurbineSecurity.getPermissionByName(
data.getParameters().getString("name"));
try
1.8 +5 -5
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/role/FluxRoleAction.java
Index: FluxRoleAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/role/FluxRoleAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FluxRoleAction.java 17 Jul 2003 18:41:07 -0000 1.7
+++ FluxRoleAction.java 28 Jul 2003 21:59:11 -0000 1.8
@@ -75,7 +75,7 @@
throws Exception
{
//Role role = new Role();
- Role role = TurbineSecurity.getNewRole(null);
+ Role role = TurbineSecurity.getRoleInstance(null);
data.getParameters().setProperties(role);
String name = data.getParameters().getString("name");
@@ -107,7 +107,7 @@
public void doUpdate(RunData data, Context context)
throws Exception
{
- Role role = TurbineSecurity.getRole(
+ Role role = TurbineSecurity.getRoleByName(
data.getParameters().getString("name"));
data.getParameters().setProperties(role);
@@ -133,7 +133,7 @@
public void doDelete(RunData data, Context context)
throws Exception
{
- Role role = TurbineSecurity.getRole(
+ Role role = TurbineSecurity.getRoleByName(
data.getParameters().getString("name"));
try
@@ -161,7 +161,7 @@
* Grab the role we are trying to update.
*/
String name = data.getParameters().getString("name");
- Role role = TurbineSecurity.getRole(name);
+ Role role = TurbineSecurity.getRoleByName(name);
/*
* Grab the permissions for the role we are
@@ -183,7 +183,7 @@
String rolePermission = roleName + permissionName;
String formRolePermission =
data.getParameters().getString(rolePermission);
- Permission permission = TurbineSecurity.getPermission(permissionName);
+ Permission permission =
TurbineSecurity.getPermissionByName(permissionName);
if (formRolePermission != null && !rolePermissions.contains(permission))
1.8 +3 -3
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/group/FluxGroupAction.java
Index: FluxGroupAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/group/FluxGroupAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FluxGroupAction.java 17 Jul 2003 18:41:06 -0000 1.7
+++ FluxGroupAction.java 28 Jul 2003 21:59:11 -0000 1.8
@@ -77,7 +77,7 @@
throws Exception
{
// Group group = new Group();
- Group group = TurbineSecurity.getNewGroup(null);
+ Group group = TurbineSecurity.getGroupInstance(null);
data.getParameters().setProperties(group);
String name = data.getParameters().getString("name");
@@ -109,7 +109,7 @@
public void doUpdate(RunData data, Context context)
throws Exception
{
- Group group = TurbineSecurity.getGroup(
+ Group group = TurbineSecurity.getGroupByName(
data.getParameters().getString("name"));
data.getParameters().setProperties(group);
@@ -135,7 +135,7 @@
public void doDelete(RunData data, Context context)
throws Exception
{
- Group group = TurbineSecurity.getGroup(
+ Group group = TurbineSecurity.getGroupByName(
data.getParameters().getString("name"));
try
1.11 +7 -7
jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools/FluxTool.java
Index: FluxTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools/FluxTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FluxTool.java 17 Jul 2003 18:41:06 -0000 1.10
+++ FluxTool.java 28 Jul 2003 21:59:11 -0000 1.11
@@ -131,11 +131,11 @@
String name = data.getParameters().getString("name");
if ( name == null || name.length() == 0)
{
- group = TurbineSecurity.getNewGroup(null);
+ group = TurbineSecurity.getGroupInstance(null);
}
else
{
- group = TurbineSecurity.getGroup(name);
+ group = TurbineSecurity.getGroupByName(name);
}
}
return group;
@@ -160,11 +160,11 @@
String name = data.getParameters().getString("name");
if ( name == null || name.length() == 0)
{
- role = TurbineSecurity.getNewRole(null);
+ role = TurbineSecurity.getRoleInstance(null);
}
else
{
- role = TurbineSecurity.getRole(name);
+ role = TurbineSecurity.getRoleByName(name);
}
}
return role;
@@ -186,11 +186,11 @@
String name = data.getParameters().getString("name");
if ( name == null || name.length() == 0)
{
- permission = TurbineSecurity.getNewPermission(null);
+ permission = TurbineSecurity.getPermissionInstance(null);
}
else
{
- permission = TurbineSecurity.getPermission(name);
+ permission = TurbineSecurity.getPermissionByName(name);
}
}
return permission;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
