struts-cvs — Automatic mailings from Struts SF Apps CVS

[Struts-cvs] artimus/WEB-INF/src/java/org/apache/artimus/keys Access.java,1.1.1.1,1.2

[<th...@us...>]

Update of /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/keys
In directory usw-pr-cvs1:/tmp/cvs-serv3613

Modified Files:
	Access.java 
Log Message:
+ keys.Access: Revise to extend latest version of scaffold.sql.AccessBase


Index: Access.java
===================================================================
RCS file: /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/keys/Access.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Access.java	14 Aug 2002 21:11:59 -0000	1.1.1.1
--- Access.java	23 Aug 2002 14:24:10 -0000	1.2
***************
*** 7,10 ****
--- 7,12 ----
  import org.apache.commons.scaffold.lang.PropertiesException;
  import org.apache.commons.scaffold.lang.ResourceException;
+ 
+ import org.apache.commons.scaffold.sql.AccessBase;
  import org.apache.commons.scaffold.sql.StatementUtils;
  
***************
*** 16,20 ****
   * @version $Revision$ $Date$
   */
! public final class Access {
  
  
--- 18,23 ----
   * @version $Revision$ $Date$
   */
! public final class Access extends AccessBase {
! 
  
  
***************
*** 24,28 ****
       * Token for "keys.table.create" command.
       */
!     public static String KEYS_CREATE_TABLE = "keys.table.create";
  
      /**
--- 27,31 ----
       * Token for "keys.table.create" command.
       */
!     public static String KEYS_TABLE_CREATE = "keys.table.create";
  
      /**
***************
*** 37,80 ****
  
  
- // -------------------------------------------------------------- Commands
- 
-     /**
-      * Our command string properties.
-      * Can be loaded from an external properties file at startup.
-      */
-     private static Properties commands;
- 
- 
-     /**
-      * Retrieve command from <code>commands</code> Properties for
-      * <code>key</code>.
-      *
-      * @fixme Could use a merge feature to reuse common substrings,
-      * like table names ["SELECT ${searchFields} FROM ${articleTable}"]
-      */
-     public static final String getCommand(String key)
-             throws ResourceException {
- 
-             // MissingResourceException ?
-         if (null==commands) throw new PropertiesException();
- 
-         return commands.getProperty(key);
-     }
- 
- 
-     /**
-      * Configure the data access system.
-      * <p>
-      * This method sets up the SQL connection pool adaptor.
-      * A new adaptor can be used by changing this method.
-      * This can be called once by main or servlet.init at startup.
-      */
-     public static final void init(Properties _commands) {
- 
-         if (null==commands) commands = _commands;
- 
-     }
- 
- 
  // ------------------------------------------------------------------ API
  
--- 40,43 ----
***************
*** 94,140 ****
              throws ResourceException {
  
!         try {
! 
!              int result = StatementUtils.executeUpdate(
!                  null,getCommand(KEYS_CREATE_TABLE));
!         }
!         catch (SQLException e) {
!             throw new ResourceException(e);
!         }
  
      } // end createTable()
- 
- 
-     /**
-      * Returns next sequential key for given table.
-      * Calls <code>scaffold.StatementUtils.createKey()</code>.
-      *
-      * @return An Integer representing the allocated key
-      * @exception SQLException if SQL error occurs
-      * @param keyName The name of the table for this key
-      */
-     public static final Integer createKey(String keyName)
-             throws ResourceException {
- 
-         Object result = null;
- 
-         try {
- 
-             result = StatementUtils.createKey(
-                 null,
-                 1,
-                 getCommand(KEYS_NEXT),
-                 keyName,
-                 getCommand(KEYS_INC)
-             );
-         }
- 
-         catch (SQLException e) {
-             throw new ResourceException(e);
-         }
- 
-         return (Integer) result;
- 
-    } // end createKey()
  
  
--- 57,63 ----
              throws ResourceException {
  
!         executeUpdate(KEYS_TABLE_CREATE);
  
      } // end createTable()
  
  

[Struts-cvs] artimus/WEB-INF/src/java/org/apache/artimus/article Store.java,1.1.1.1,1.2 Access.java,1.1.1.1,1.2

[<th...@us...>]

Update of /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/article
In directory usw-pr-cvs1:/tmp/cvs-serv3373

Modified Files:
	Store.java Access.java 
Log Message:
+ keys.Access: Revise to extend latest version of scaffold.sql.AccessBase


Index: Store.java
===================================================================
RCS file: /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/article/Store.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Store.java	14 Aug 2002 21:11:59 -0000	1.1.1.1
--- Store.java	23 Aug 2002 14:23:42 -0000	1.2
***************
*** 10,13 ****
--- 10,17 ----
  
  
+ import java.sql.SQLException;
+ import org.apache.commons.scaffold.sql.StatementUtils;
+ 
+ 
  /**
   * Insert or update an article.
***************
*** 30,35 ****
      public void createKey() throws Exception {
  
!         Integer key = org.apache.artimus.keys.Access.createKey(
!             Access.getCommand(Access.ARTICLE_TABLE));
  
          setArticle(key);
--- 34,38 ----
      public void createKey() throws Exception {
  
!         Integer key = Access.createKey(Access.ARTICLE_TABLE);
  
          setArticle(key);

Index: Access.java
===================================================================
RCS file: /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/article/Access.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Access.java	14 Aug 2002 21:11:57 -0000	1.1.1.1
--- Access.java	23 Aug 2002 14:23:43 -0000	1.2
***************
*** 52,55 ****
--- 52,56 ----
  public final class Access extends AccessBase {
  
+ 
  // -------------------------------------------------------- Command Tokens
  

[Struts-cvs] artimus/WEB-INF/src/java/org/apache/artimus CreateResources.java,1.1.1.1,1.2

[<th...@us...>]

Update of /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus
In directory usw-pr-cvs1:/tmp/cvs-serv3086

Modified Files:
	CreateResources.java 
Log Message:
+ CreateResources: Revise to allow exceptions to be thrown and report actual errors.


Index: CreateResources.java
===================================================================
RCS file: /cvsroot/struts/artimus/WEB-INF/src/java/org/apache/artimus/CreateResources.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CreateResources.java	14 Aug 2002 21:11:56 -0000	1.1.1.1
--- CreateResources.java	23 Aug 2002 14:23:05 -0000	1.2
***************
*** 44,61 ****
      public Object execute(Object parameters) throws Exception {
  
! 
!         try {
!             org.apache.artimus.keys.Access.createTable();
!         }
!         catch (Exception e) {
! 
!         }
! 
!         try {
!             org.apache.artimus.article.Access.createResources();
!         }
!         catch (Exception e) {
!         }
! 
  
          ArrayList list = null;
--- 44,49 ----
      public Object execute(Object parameters) throws Exception {
  
!         org.apache.artimus.keys.Access.createTable();
!         org.apache.artimus.article.Access.createResources();
  
          ArrayList list = null;
***************
*** 97,104 ****
          }
  
!             // return outcome
          ProcessResult result = new ProcessResultBase(this);
!             result.addMessage(Tokens.PROCESS_COMPLETE);
!         return (Object) result;
      }
  }
--- 85,92 ----
          }
  
!         // return outcome
          ProcessResult result = new ProcessResultBase(this);
!             result.addMessage("process.complete");
!         return result;
      }
  }

[Struts-cvs] register/WEB-INF/classes/app RegisterForm.java,NONE,1.1 RegisterAction.java,NONE,1.1

[<th...@us...>]

Update of /cvsroot/struts/register/WEB-INF/classes/app
In directory usw-pr-cvs1:/tmp/cvs-serv25269

Added Files:
	RegisterForm.java RegisterAction.java 
Log Message:
Add files from "register-complete"

--- NEW FILE: RegisterForm.java ---
package app;
import org.apache.struts.action.*;

public class RegisterForm extends ActionForm {
  protected String username;
  protected String password1;
  protected String password2;

  public String getUsername () {return this.username;};
  public String getPassword1() {return this.password1;};
  public String getPassword2() {return this.password2;};
  
  public void   setUsername (String username) {this.username = username;};
  public void   setPassword1(String password) {this.password1 = password;};
  public void   setPassword2(String password) {this.password2 = password;};

}

--- NEW FILE: RegisterAction.java ---
package registerapp;
import org.apache.struts.action.*;
import javax.servlet.http.*;
import java.io.*;

public class RegisterAction extends Action {

public ActionForward perform (ActionMapping mapping,
                              ActionForm form,
                              HttpServletRequest req,
                              HttpServletResponse res) {
 
 // (1) Cast the form to the RegisterForm 
 RegisterForm rf = (RegisterForm) form;
  
 String username  = rf.getUsername(); 
 String password1 = rf.getPassword1();                             
 String password2 = rf.getPassword2();                             
 
 // (2) Apply business logic
 if (password1.equals(password2)) {
 	
    try {
// (3) Return ActionForward for success        
       UserDirectory.getInstance().setUser(username,password1);
       return mapping.findForward("success");
    } catch (UserDirectoryException e) {
       return mapping.findForward("failure");
    }
    
 }    
 // (4) Return ActionForward for failure 
 return mapping.findForward("failure");
}

}

[Struts-cvs] register/WEB-INF struts-config.xml,1.1.1.1,1.2

[<th...@us...>]

Update of /cvsroot/struts/register/WEB-INF
In directory usw-pr-cvs1:/tmp/cvs-serv25078

Modified Files:
	struts-config.xml 
Log Message:
Add files from "register-complete"

Index: struts-config.xml
===================================================================
RCS file: /cvsroot/struts/register/WEB-INF/struts-config.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** struts-config.xml	20 Aug 2002 11:09:41 -0000	1.1.1.1
--- struts-config.xml	20 Aug 2002 11:22:58 -0000	1.2
***************
*** 12,20 ****
   
    <action-mappings>
!     <action    path=""
!                type=""
!                name="">
!       <forward name="" path=""/>
!       <forward name="" path=""/>
      </action>
    </action-mappings>
--- 12,20 ----
   
    <action-mappings>
!     <action    path="/register"
!                type="app.RegisterAction"
!                name="registerForm">
!       <forward name="success" path="/success.html"/>
!       <forward name="failure" path="/failure.html"/>
      </action>
    </action-mappings>

[Struts-cvs] register success.html,NONE,1.1 register.jsp,NONE,1.1 failure.html,NONE,1.1

[<th...@us...>]

Update of /cvsroot/struts/register
In directory usw-pr-cvs1:/tmp/cvs-serv25020

Added Files:
	success.html register.jsp failure.html 
Log Message:
Add files from "register-complete"

--- NEW FILE: success.html ---
<HTML>
<HEAD>
   <TITLE>SUCCESS</TITLE>
</HEAD>
<BODY>
   Registration succeeded!
   <P><A href="register.jsp">try another?</A></P>
</BODY>
</HTML>

--- NEW FILE: register.jsp ---
<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>

<form:form action="register.do">
   UserName:<form:text property="username"/><br>
   enter password:<form:password property="password1"/><br>
   re-enter password:<form:password property="password2"/><br>
<form:submit value="Register"/>
</form:form>

--- NEW FILE: failure.html ---
<HTML>
<HEAD>
   <TITLE>FAILURE</TITLE>
</HEAD>
<BODY>
   Registration failed!
   <P><A href="register.jsp">try again?</A></P>
</BODY>
</HTML>

[Struts-cvs] blank/WEB-INF/src README.txt,1.1.1.1,1.2

[<th...@us...>]

Update of /cvsroot/struts/blank/WEB-INF/src
In directory usw-pr-cvs1:/tmp/cvs-serv3100

Modified Files:
	README.txt 
Log Message:
Add clarification as to purpose of this application.

Index: README.txt
===================================================================
RCS file: /cvsroot/struts/blank/WEB-INF/src/README.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README.txt	15 Aug 2002 17:16:48 -0000	1.1.1.1
--- README.txt	19 Aug 2002 15:29:32 -0000	1.2
***************
*** 6,9 ****
--- 6,13 ----
  - It's an "empty" application provided to help you get started on your own project. Just copy the struts-blank.war to a new WAR file using the name for your application. Place it in your container's "webapp" folder (or equivalent), and let your container auto-deploy the application. Edit the skeleton configuration files as needed, restart your container, and you are on your way! (You can find the application.properties file with this message in the /WEB-INF/src/java/resources folder.)
  
+ What's the difference between this application and the one in the Struts distribution?
+ 
+ -  The Struts 1.1 version of the blank application changed the location of some of the files. This version uses the same layout as the Blank 1.1 application, but it designed for use with Struts 1.0.
+ 
  Where do I put my own code?