jvanzyl 01/08/01 08:40:47
Modified: src/share/sample30/src/java/modules/actions SQL.java
SecureAction.java Upload.java
src/share/sample30/src/java/modules/screens BSF.java
Form.java Index.java SecureScreen.java
src/share/sample30/src/java/modules/tags UserInfoTag.java
Log:
- reflect changes in services
Revision Changes Path
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SQL.java
Index: SQL.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SQL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQL.java 2001/07/13 20:56:26 1.1
+++ SQL.java 2001/08/01 15:40:19 1.2
@@ -56,7 +56,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import @[email protected];
import @[email protected];
1.3 +3 -3
jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SecureAction.java
Index: SecureAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SecureAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecureAction.java 2001/07/15 18:39:41 1.2
+++ SecureAction.java 2001/08/01 15:40:20 1.3
@@ -55,10 +55,10 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.modules.actions.TemplateSecureAction;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.security.util.AccessControlList;
import org.apache.turbine.TemplateContext;
+import org.apache.turbine.modules.actions.TemplateSecureAction;
+import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* Velocity Secure action.
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/Upload.java
Index: Upload.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/Upload.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Upload.java 2001/07/13 20:56:26 1.1
+++ Upload.java 2001/08/01 15:40:20 1.2
@@ -57,8 +57,8 @@
import java.io.File;
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.upload.FileItem;
import org.apache.turbine.TemplateContext;
+import org.apache.fulcrum.upload.FileItem;
/**
* Class responsible for performing the company admin actions
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/BSF.java
Index: BSF.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/BSF.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BSF.java 2001/07/13 20:56:26 1.1
+++ BSF.java 2001/08/01 15:40:27 1.2
@@ -56,7 +56,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.bsf.TurbineBSF;
+import org.apache.fulcrum.bsf.TurbineBSF;
/**
* Grab all the records in a table using a Peer, and
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/Form.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Form.java 2001/07/13 20:56:26 1.1
+++ Form.java 2001/08/01 15:40:29 1.2
@@ -56,7 +56,7 @@
import java.util.Vector;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.TemplateContext;
import @[email protected];
import @[email protected];
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/Index.java
Index: Index.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/Index.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Index.java 2001/07/13 20:56:26 1.1
+++ Index.java 2001/08/01 15:40:34 1.2
@@ -56,7 +56,7 @@
import java.util.Vector;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.TemplateContext;
import @[email protected];
1.3 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/SecureScreen.java
Index: SecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/SecureScreen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecureScreen.java 2001/07/15 18:39:42 1.2
+++ SecureScreen.java 2001/08/01 15:40:38 1.3
@@ -58,8 +58,8 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.security.util.AccessControlList;
import org.apache.turbine.modules.screens.TemplateSecureScreen;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* Grab all the records in a table using a Peer, and
1.3 +1 -2
jakarta-turbine-tdk/src/share/sample30/src/java/modules/tags/UserInfoTag.java
Index: UserInfoTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/tags/UserInfoTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserInfoTag.java 2001/07/15 18:39:42 1.2
+++ UserInfoTag.java 2001/08/01 15:40:45 1.3
@@ -5,10 +5,9 @@
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-
import org.apache.turbine.RunData;
import org.apache.turbine.services.jsp.JspService;
-import org.apache.turbine.services.security.entity.User;
+import org.apache.fulcrum.security.entity.User;
/**
* UserInfoTag is a sample JSP tag handler that displays the full
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
