You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/08/01 17:19:17 UTC
cvs commit: jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools FluxTool.java
jvanzyl 01/08/01 08:19:17
Modified: . NOTES
src/java/org/apache/turbine/flux/modules/actions
FluxAction.java
src/java/org/apache/turbine/flux/modules/actions/group
FluxGroupAction.java
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/user
FluxUserAction.java
src/java/org/apache/turbine/flux/modules/screens
FluxIndex.java FluxScreen.java
src/java/org/apache/turbine/flux/tools FluxTool.java
Added: . build.xml
Removed: build build.xml
Log:
- moving build files to the top level directory. will align with
the torque/fulcrum build methodology shortly.
- update all the classes to reflect the movement of the security
service to fulcrum proper.
Revision Changes Path
1.2 +17 -0 jakarta-turbine-flux/NOTES
Index: NOTES
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/NOTES,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOTES 2001/03/26 00:49:37 1.1
+++ NOTES 2001/08/01 15:19:15 1.2
@@ -9,3 +9,20 @@
These should be JAR files that could be picked
up automatically. This will work now that velocity
can load templates off the classpath.
+
+----------------------------------------------------------------------
+T E S T I N G
+----------------------------------------------------------------------
+
+Testing performed manually that has to be automated.
+Going to try and use Cactus (J2EEUnit).
+
+- add/edit/remove user
+- add/remove group
+- add/remove role
+- add/remove permission
+- add role/apply to user
+- add permission/apply to role
+
+Everything looks good after the new security changes.
+15 Apr 2001 (jvz)
1.1 jakarta-turbine-flux/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<!-- Build file for application -->
<project name="admin" default="compile" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
<property file="${user.home}/.ant.properties" />
<property name="name" value="flux"/>
<property name="version" value="0.1"/>
<property name="project" value="flux"/>
<property name="build.compiler" value="classic"/>
<property name="build.dir" value="./bin"/>
<property name="build.dest" value="./bin/classes"/>
<property name="src.dir" value="../src"/>
<property name="java.src.dir" value="./src/java"/>
<property name="template.src.dir" value="../src/templates"/>
<property name="resources.src.dir" value="../src/resources"/>
<property name="final.name" value="${project}-${version}"/>
<property name="ant.home" value="."/>
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="on"/>
<property name="project.home" value="project"/>
<property name="project.props" value="${project.home}/${project}.properties"/>
<property file="${project.props}"/>
<path id="classpath">
<fileset dir="../jakarta-turbine/bin">
<include name="**/*.jar"/>
</fileset>
<fileset dir="../jakarta-turbine/lib">
<include name="**/*.jar"/>
</fileset>
</path>
<!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
<target name="prepare">
<mkdir dir="${build.dest}"/>
</target>
<!-- =================================================================== -->
<!-- C O M P I L E F L U X -->
<!-- =================================================================== -->
<target name="compile"
depends="prepare"
description="--> compiles the source code">
<javac srcdir="${java.src.dir}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
<classpath refid="classpath"/>
</javac>
</target>
<!-- ================================================================== -->
<!-- Compiles the source directory and creates a .jar file -->
<!-- ================================================================== -->
<target name="jar"
depends="compile"
description="--> generates the .jar file">
<jar jarfile="${build.dir}/${project}.jar">
<fileset dir="${build.dest}"/>
<fileset dir="${src.dir}">
<exclude name="**/java/**"/>
</fileset>
</jar>
</target>
<!-- ================================================================== -->
<!-- Cleans up the build directory -->
<!-- ================================================================== -->
<target name="clean" description="--> cleans up the build directory">
<delete dir="${build.dir}"/>
</target>
</project>
1.5 +1 -1 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxAction.java
Index: FluxAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FluxAction.java 2001/07/15 18:34:12 1.4
+++ FluxAction.java 2001/08/01 15:19:17 1.5
@@ -58,7 +58,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateAction;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* General Flux action.
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FluxGroupAction.java 2001/07/17 11:53:07 1.5
+++ FluxGroupAction.java 2001/08/01 15:19:17 1.6
@@ -57,11 +57,11 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.entity.Group;
-import org.apache.turbine.services.security.util.EntityExistsException;
-import org.apache.turbine.services.security.util.UnknownEntityException;
-import org.apache.turbine.services.security.util.GroupSet;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.util.EntityExistsException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.util.GroupSet;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.flux.modules.actions.FluxAction;
/**
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FluxPermissionAction.java 2001/07/17 11:53:08 1.5
+++ FluxPermissionAction.java 2001/08/01 15:19:17 1.6
@@ -56,11 +56,11 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.entity.Permission;
-import org.apache.turbine.services.security.util.EntityExistsException;
-import org.apache.turbine.services.security.util.UnknownEntityException;
-import org.apache.turbine.services.security.util.PermissionSet;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.Permission;
+import org.apache.fulcrum.security.util.EntityExistsException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.util.PermissionSet;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.flux.modules.actions.FluxAction;
/**
1.6 +7 -7 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FluxRoleAction.java 2001/07/17 11:53:09 1.5
+++ FluxRoleAction.java 2001/08/01 15:19:17 1.6
@@ -56,13 +56,13 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.entity.Role;
-import org.apache.turbine.services.security.entity.Permission;
-import org.apache.turbine.services.security.util.EntityExistsException;
-import org.apache.turbine.services.security.util.UnknownEntityException;
-import org.apache.turbine.services.security.util.RoleSet;
-import org.apache.turbine.services.security.util.PermissionSet;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.entity.Permission;
+import org.apache.fulcrum.security.util.EntityExistsException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.util.RoleSet;
+import org.apache.fulcrum.security.util.PermissionSet;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.flux.modules.actions.FluxAction;
/**
1.5 +7 -7 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/user/FluxUserAction.java
Index: FluxUserAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/user/FluxUserAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FluxUserAction.java 2001/07/17 11:53:10 1.4
+++ FluxUserAction.java 2001/08/01 15:19:17 1.5
@@ -58,13 +58,13 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateAction;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.entity.User;
-import org.apache.turbine.services.security.entity.Group;
-import org.apache.turbine.services.security.entity.Role;
-import org.apache.turbine.services.security.util.EntityExistsException;
-import org.apache.turbine.services.security.util.UnknownEntityException;
-import org.apache.turbine.services.security.util.AccessControlList;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.util.EntityExistsException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.util.AccessControlList;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.flux.modules.actions.FluxAction;
/**
1.8 +1 -1 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxIndex.java
Index: FluxIndex.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxIndex.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FluxIndex.java 2001/07/17 01:21:37 1.7
+++ FluxIndex.java 2001/08/01 15:19:17 1.8
@@ -58,7 +58,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.TemplateScreen;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* Base screen for secure web access to the storage side of Tambora.
1.7 +1 -1 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxScreen.java
Index: FluxScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FluxScreen.java 2001/07/17 01:21:37 1.6
+++ FluxScreen.java 2001/08/01 15:19:17 1.7
@@ -58,7 +58,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.TemplateScreen;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* Base screen for secure web acces to the storage side of Tambora.
1.7 +9 -8 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FluxTool.java 2001/07/15 18:34:16 1.6
+++ FluxTool.java 2001/08/01 15:19:17 1.7
@@ -57,16 +57,17 @@
import java.util.Vector;
import java.util.Iterator;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.security.entity.Group;
-import org.apache.turbine.services.security.entity.Role;
-import org.apache.turbine.services.security.entity.Permission;
-import org.apache.turbine.services.security.entity.User;
-import org.apache.turbine.services.security.util.AccessControlList;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.services.pool.Recyclable;
import org.apache.turbine.util.Log;
+
+import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.entity.Permission;
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.util.AccessControlList;
+import org.apache.fulcrum.pool.Recyclable;
+import org.apache.fulcrum.security.TurbineSecurity;
/**
* The pull api for flux templates
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org