mpoeschl 2003/07/28 14:25:58
Modified: src/java/org/apache/turbine/flux/modules/actions/permission
FluxPermissionAction.java
. project.xml
Log:
replace deprecated turbine log with commons-logging
Revision Changes Path
1.8 +11 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FluxPermissionAction.java 17 Jul 2003 18:41:06 -0000 1.7
+++ FluxPermissionAction.java 28 Jul 2003 21:25:57 -0000 1.8
@@ -54,21 +54,29 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.turbine.flux.modules.actions.FluxAction;
+
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.UnknownEntityException;
+
import org.apache.velocity.context.Context;
/**
* Action to manage permissions in Turbine.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @version $Id$
*/
public class FluxPermissionAction extends FluxAction
{
+ private static Log log = LogFactory.getLog(FluxPermissionAction.class);
+
/**
* ActionEvent responsible for inserting a new user
* into the Turbine security system.
@@ -123,7 +131,7 @@
* think we should use the an id so that
* this can't happen.
*/
- org.apache.turbine.util.Log.error(uee);
+ log.error(uee);
}
}
@@ -148,7 +156,7 @@
* think we should use the an id so that
* this can't happen.
*/
- org.apache.turbine.util.Log.error(uee);
+ log.error(uee);
}
}
@@ -162,7 +170,7 @@
public void doPerform( RunData data,Context context )
throws Exception
{
- System.out.println("Running do perform!");
+ log.info("Running do perform!");
data.setMessage("Can't find the requested action!");
}
}
1.4 +8 -0 jakarta-turbine-flux/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 25 Jul 2003 19:59:45 -0000 1.3
+++ project.xml 28 Jul 2003 21:25:57 -0000 1.4
@@ -89,6 +89,14 @@
</properties>
</dependency>
<dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging.html</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
<id>ecs</id>
<version>1.4.2</version>
<url>http://jakarta.apache.org/ecs/</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
