dynxform-commits — CVS commits list

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db/action DatabaseAction.java,NONE,1.1 DatabaseActionExecutor.java,NONE,1.1 DatabaseActionPool.java,NONE,1.1

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/db/action

Added Files:
	DatabaseAction.java DatabaseActionExecutor.java 
	DatabaseActionPool.java 
Log Message:
moved all database depencies to db package

--- NEW FILE: DatabaseAction.java ---
package net.sf.dynxform.db.action;

import net.sf.dynxform.exception.business.BusinessException;
import net.sf.dynxform.exception.system.SystemException;
import net.sf.dynxform.form.FormContext;
import net.sf.dynxform.form.data.ModuleType;
import net.sf.dynxform.form.data.manage.ModuleBinderManager;
import net.sf.dynxform.form.data.module.SourceModule;
import net.sf.dynxform.form.model.FormDefinition;
import net.sf.dynxform.action.AbstractAction;

import java.util.Map;

/**
 * net.sf.dynxform.form.model.action Feb 24, 2004 6:09:31 PM andreyp
 * Copyright (c) dynxform.sf.net. All Rights Reserved
 */
public final class DatabaseAction implements AbstractAction {
  private static final String ACTION_PARAMETER = "action";

  public final void execute(final Map parameters, final FormContext formContext, final FormDefinition definition) throws SystemException, BusinessException {
    final DatabaseActionExecutor actionExecutor = new DatabaseActionExecutor();
    final String actionName = (String) parameters.get(ACTION_PARAMETER);
    if (actionName == null)
      throw new BusinessException("Parameter \"" + ACTION_PARAMETER + "\" should be defined!");

    final Map outParameters = actionExecutor.executeAction(definition.getForm().getGuid(), actionName, parameters);

    final SourceModule module =
        formContext.getDataModule(ModuleType.OUTPUT);

    module.setup(outParameters);
    final ModuleBinderManager manager =
        formContext.getSourceManagerByType(ModuleType.OUTPUT);

    manager.update(module, formContext);
  }
}

--- NEW FILE: DatabaseActionPool.java ---
/*
 * Created by IntelliJ IDEA.
 * User: yurib
 * Date: Feb 19, 2004
 * Time: 4:38:05 PM
 */
package net.sf.dynxform.db.action;

import net.sf.dynxform.action.schema.Action;
import net.sf.dynxform.action.schema.ActionList;
import net.sf.dynxform.container.DefinitionProvider;
import net.sf.dynxform.exception.business.BusinessException;
import net.sf.dynxform.util.BasePool;
import org.apache.commons.lang.StringUtils;

import java.net.URL;
import java.util.Enumeration;

public final class DatabaseActionPool extends BasePool {
    private final DefinitionProvider definitionProvider = DefinitionProvider.getInstance();

  private static DatabaseActionPool actionPool = null;

    private DatabaseActionPool() {
        this.setFactory(new ActionPoolFactory());
        this.configure("action");
    }


    public static synchronized DatabaseActionPool getInstance() {
        if (actionPool == null) actionPool = new DatabaseActionPool();
        return actionPool;
    }

  public DefinitionProvider getDefinitionProvider() {
    return definitionProvider;
  }

  final class ActionPoolFactory extends BasePool.BasePoolFactory {

        ActionPoolFactory() {
            super(ActionList.class);
        }

        protected final URL getFileUrl(final Object o) throws BusinessException {
            return getDefinitionProvider().getActionUrl((String) o);
        }

        protected final String getActionName(final Object o) throws BusinessException {
            final String key = (String) o;
            final String[] keyParts = StringUtils.split(key, ':');
            if (keyParts.length != 2) throw new BusinessException("Key is not falid and contains more than one semicolon:" + key);
            return keyParts[1];
        }

        protected final Object getPoolableFromUnmarshallled(final Object key, final Object unmarshalled) throws BusinessException {
            Action action = null;
            final ActionList actionList = (ActionList) unmarshalled;
            final String actionName = getActionName(key);
            final Enumeration enu = actionList.enumerateAction();
            while (enu.hasMoreElements()) {
                action = (Action) enu.nextElement();
                if (action != null && action.getName().equalsIgnoreCase(actionName)) break;
            }
            return action;
        }
    }
}

--- NEW FILE: DatabaseActionExecutor.java ---
/*
 * Created by IntelliJ IDEA.
 * User: yurib
 * Date: Feb 19, 2004
 * Time: 4:17:17 PM
 */
package net.sf.dynxform.db.action;

import net.sf.dynxform.action.schema.Action;
import net.sf.dynxform.db.DatabaseConnection;
import net.sf.dynxform.db.StoredProcedure;
import net.sf.dynxform.exception.business.BusinessException;
import net.sf.dynxform.exception.system.SystemException;
import net.sf.dynxform.report.schema.Procedure;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;

import java.util.HashMap;
import java.util.Map;


public final class DatabaseActionExecutor {
  static final Log log = LogFactory.getLog(DatabaseActionExecutor.class);
  private static final DatabaseConnection databaseConnection = DatabaseConnection.create();

  public final Map executeAction(final String formID, final String actionName, final Map parameters) throws SystemException, BusinessException {
    Action action = null;
    StoredProcedure storedProcedure;
    Map out;
    final String actionID = formID + ':' + actionName;
    final DatabaseActionPool actionPool = DatabaseActionPool.getInstance();
    try {
      try {
        action = (Action) actionPool.borrowObject(actionID);
      }
      catch (Exception ex) {
        throw new BusinessException("Cannot found action:" + actionName + " for form: " + formID, ex);
      }
      try {
        if (log.isDebugEnabled())
          log.debug("Action: " + actionName + " mapping found. Try to find mapped procedures...");

        for (int j = 0; j < action.getProcedureCount(); j++) {
          final Procedure procedure = action.getProcedure(j);

          if (log.isDebugEnabled())
            log.debug("Mapped procedure for action: " + actionName + " gotten successfully, trying to execute it...");

          storedProcedure = new StoredProcedure(procedure, parameters);

          if (log.isDebugEnabled())
            log.debug("Procedure execution information stored into result row set...");

          storedProcedure.setConnection(databaseConnection.get());
          storedProcedure.execute();
          out = storedProcedure.getOutParams();
          if (out != null) {
            final Object obj = parameters.get("output");
            if (obj != null && obj instanceof HashMap) {
              ((HashMap) obj).putAll(out);
            }
            else {
              parameters.put("output", out);
            }
          }

        }
      }
      catch (Exception e) {
        throw new BusinessException("Fail to build resultset for action " + actionName + "form:(" + formID + ')', e);
      }
    }
    finally {
      try {
        if (action != null) {
          actionPool.returnObject(actionID, action);
        }
      }
      catch (Exception e) {
        log.error("Failed to return action" + actionID + " to pool", e);
      }
    }


    return (Map) parameters.get("output");
  }
}

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db BindParameters.java,NONE,1.1 DatabaseConnection.java,NONE,1.1 Query.java,NONE,1.1 StoredProcedure.java,NONE,1.1

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/db

Added Files:
	BindParameters.java DatabaseConnection.java Query.java 
	StoredProcedure.java 
Log Message:
moved all database depencies to db package

--- NEW FILE: Query.java ---
/*
 * Created by IntelliJ IDEA.
 * User: yurib
 * Date: Feb 18, 2004
 * Time: 11:39:14 AM
 */
package net.sf.dynxform.db;

import net.sf.dynxform.exception.business.SQLStatementException;
import net.sf.dynxform.report.schema.*;
import net.sf.dynxform.report.schema.types.ParamOperand;
import net.sf.dynxform.util.ValueUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.*;

public class Query {
  private static final Log log = LogFactory.getLog(Query.class);
  protected Report report;
  protected net.sf.dynxform.form.types.Report outputReport;
  protected HashMap outputParams;

  private boolean isClosedAfterExecute = true;

  /**
   * SQL configuration information *
   */
  protected HashMap parameters;

  /**
   * The connection, once opened *
   */
  protected Connection conn;

  /**
   * And the statements *
   */
  protected PreparedStatement pst;

  /**
   * The results, of course *
   */
  protected java.sql.ResultSet rs = null;

  protected final String name = null;

  /**
   * If it is an update/etc, the return value (num rows modified) *
   */
  protected int rv = -1;

  /**
   * Mapping out parameters - objectModel *
   */
  protected String query;


  protected String getParameterValue(final String paramName) throws SQLStatementException {
    String paramValue;

    paramValue = (String)
        parameters.get(paramName.toLowerCase());
    if (paramValue == null)
      paramValue = (String) parameters.get(paramName.toUpperCase());

    if (paramValue == null)
      throw new SQLStatementException("Cannot find value for query parameter \"" + paramName + '\"');
    return paramValue;
  }

  public Query(final Report report, final Map parameters) throws SQLStatementException {
    this.report = report;
    this.parameters = new HashMap(parameters);
    this.bindQueryParameters(this.processfilters());
  }

  /**
   * Required for child classes
   */
  protected Query() {
  }

  private void bindQueryParameters(final String queryString) throws SQLStatementException {
    query = queryString;
    if (query != null) {
      final ArrayList queryParams = BindParameters.getQueryParameterNames(query);
      final Iterator it = queryParams.iterator();
      while (it.hasNext()) {
        final String paramName = (String) it.next();
        final String paramValue = getParameterValue(paramName);
        query = BindParameters.bind(query, paramName, paramValue);
      }
      query = StringUtils.replace(query.trim(), "\r", " ", -1);
    }
  }

  public final void setConnection(final Connection conn) {
    this.conn = conn;
  }

  public final void execute() throws SQLStatementException {
    if (conn == null) {
      throw new SQLStatementException("A connection must be set before executing a query");
    }
    if (query == null) {
      throw new SQLStatementException("A query must be not null");
    }
    if (log.isDebugEnabled())
      log.debug("EXECUTING " + query);
    try {
      prepare();

      final boolean result = pst.execute();
      if (result) {
        rs = pst.getResultSet();
      }
      else {
        rv = pst.getUpdateCount();
      }
      serialize();
    }
    catch (ParseException e) {
      throw new SQLStatementException("Failed to prepare statement", e);
    }
    catch (Exception e) {
      throw new SQLStatementException("Failed to execute statement", e);
    }
    finally {
      try {
        if (isClosedAfterExecute) close();
      }
      catch (SQLException e) {
        throw new SQLStatementException("Failed to close connection", e);
      }
    }
  }

  protected void prepare() throws SQLException, ParseException {
    pst = conn.prepareStatement(query,
        java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE,
        java.sql.ResultSet.CONCUR_READ_ONLY);
  }

  public void close() throws SQLException {
    try {
      if (rs != null)
        try {
          //getTheLogger().debug("Trying to close resultset "+rs.toString());
          rs.close();
          rs = null;      // This prevents us from using the resultset again.
          //250getTheLogger().debug("Really closed the resultset now.");
        }
        catch (NullPointerException e) {
          log.debug("NullPointer while closing the resultset.", e);
        }
      if (pst != null)
        pst.close();
      pst = null;        // Prevent using pst again.
    }
    finally {
      conn.close();
    }
  }


  protected void serialize() throws SQLStatementException {
    try {
      outputReport = ValueUtil.getReport(rs);
    }
    catch (SQLException ex) {
      throw new SQLStatementException("Cannot create report", ex);
    }
  }

  private String processfilters() {
    String filterValue;
    String sql = report.getSqlQueryChoice().getSqlQuery();
    final Filters filters = report.getSqlQueryChoice().getFilters();
    if (filters == null)
      return sql;

    final Enumeration fenu = filters.enumerateFilter();

    while (fenu.hasMoreElements()) {
      final Filter filter = (Filter) fenu.nextElement();
      if (filter == null)
        continue;
      final String filterName = '{' + filter.getName() + '}';
      filterValue = " ";
      if (!StringUtils.contains(sql, filterName)) continue;
      Enumeration cenu = filter.enumerateCondition();
      boolean breakFlag = false;
      if (filter.getConditionCount() == 0) {
        cenu = filter.getChoice().enumerateCondition();
        breakFlag = true;
      }
      while (cenu.hasMoreElements()) {
        final Condition condition = (Condition) cenu.nextElement();
        if (condition == null)
          continue;
        if (!checkCondition(condition, parameters))
          continue;


//        throw new UnsupportedOperationException("condition.getSqlOperand()");

        if (condition.getSqlOperand() != null) {
          filterValue += condition.getSqlOperand().toString() + '(' + condition.getValue() + ')';
        }
        else {
          filterValue += condition.getValue();
        }


        if (breakFlag) {
          break;
        }
      }
      sql = StringUtils.replace(sql, filterName, filterValue);
    }
    return sql;
  }

  private boolean checkCondition(final Condition condition, final HashMap parameters) {
    final Enumeration penu = condition.enumerateParam();
    final ParamOperand po = condition.getParamOperand();
    switch (po.getType()) {
      case ParamOperand.ALL_TYPE:
        return checkParamsValid(penu, parameters, true);
      case ParamOperand.NO_ONE_TYPE:
        return checkParamsValid(penu, parameters, false);
      case ParamOperand.EXIST_ONE_TYPE:
        return howManyParamsValid(penu, parameters) > 0;
      case ParamOperand.ONLY_ONE_TYPE:
        return howManyParamsValid(penu, parameters) == 1;
    }
    return false;
  }

  private boolean checkParamsValid(final Enumeration penu, final HashMap parameters, final boolean paramsPresent) {
    if (penu != null && parameters != null) {
      String paramName;
      String value;
      Param prm;
      while (penu.hasMoreElements()) {
        prm = (Param) penu.nextElement();
        if (prm == null) {
          continue;
        }
        paramName = prm.getName().toUpperCase();
        value = (String) parameters.get(paramName);
        if (paramsPresent) {
          if (value == null || value.length() == 0 ||
              (prm.getCheckvalue() != null && !prm.getCheckvalue().equals(value))) {
            return false;
          }
        }
        else {
          if (value != null && value.length() != 0 &&
              (prm.getCheckvalue() == null || (prm.getCheckvalue() != null && prm.getCheckvalue().equals(value)))) {
            return false;
          }
        }
      }
    }
    return true;
  }

  private int howManyParamsValid(final Enumeration penu, final HashMap parameters) {
    int result = 0;
    if (penu != null && parameters != null) {
      String paramName;
      String value;
      Param prm;
      while (penu.hasMoreElements()) {
        prm = (Param) penu.nextElement();
        if (prm == null) {
          continue;
        }
        paramName = prm.getName().toUpperCase();
        value = (String) parameters.get(paramName);
        if (value != null && value.length() != 0 &&
            (prm.getCheckvalue() == null || (prm.getCheckvalue() != null && prm.getCheckvalue().equals(value)))) {
          result++;
        }
      }
    }
    return result;
  }

  public final net.sf.dynxform.form.types.Report getReport() {
    return outputReport;
  }

  public HashMap getOutParams() {
    return outputParams;
  }


  protected abstract static class ParameterValue {
    protected abstract String getStringValue();
  }

  public final boolean isClosedAfterExecute() {
    return isClosedAfterExecute;
  }

  public final void setClosedAfterExecute(final boolean closedAfterExecute) {
    isClosedAfterExecute = closedAfterExecute;
  }
}



--- NEW FILE: DatabaseConnection.java ---
package net.sf.dynxform.db;

import net.sf.dynxform.exception.system.ConfigurationException;
import net.sf.dynxform.exception.system.DataStoreException;
import net.sf.dynxform.exception.system.SystemException;
import net.sf.dynxform.util.Constants;
import net.sf.dynxform.util.CurrentClassloader;

import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;

import java.io.IOException;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.PropertyResourceBundle;


/**
 * Returns database connections.
 * <p/>
 * <P><em>Design Note</em>: this class hides the design decision regarding
 * how connections are obtained by this application. If that decision changes,
 * then the ripple effects will be contained in this class.
 */
public final class DatabaseConnection {
  private static DatabaseConnection databaseConnection;
    private static String database_driver;
    private static String database_url;
    private static String database_username;
    private static String database_password;
    private static String database_jndi;
    private static String database_use_direct = "true";
    private static boolean isPoolingEnabled;
    private static Driver driver;
    private boolean isInitialized;

    private DatabaseConnection() {
    }


    /**
     * Return a <code>Connection</code> for performing operations on a database.
     * <p/>
     * <P>When the database operations have finished, the <code>Connection.close</code>
     * method <em>must be called on the return value</em>.
     * <p/>
     * <P>Use the returned <code>Connection</code> for performing either a single
     * database operation, or a set of closely related operations; it is highly
     * recommended that the returned <code>Connection</code> NOT be retained for
     * an extended time, and that it be used only for a single user request.
     */
    public synchronized Connection get() throws SystemException {
        if (!isInitialized) init();
        return isPoolingEnabled ? getPooledConnection() : getSimpleConnection();
    }

    private void init() throws SystemException {
        try {
            final PropertyResourceBundle properties = CurrentClassloader.getPropertyResourceBundle("db.properties");
            database_driver = properties.getString("database.driver");
            database_url = properties.getString("database.url");
            database_username = properties.getString("database.username");
            database_password = properties.getString("database.password");
            database_jndi = properties.getString("database.jndi");
            database_use_direct = properties.getString("database.use.direct");
            isPoolingEnabled = "false".equalsIgnoreCase(database_use_direct);
            isInitialized = true;
        } catch (IOException ex) {
            throw new SystemException("Fail to load db.properties file", ex);
        }
    }

    /**
     * Conventional prefix for all JNDI names.
     */
    private static final String STANDARD_ENVIRONMENT = "java:comp/env/";

    private static void loadDbDriver() {
        try {
            driver = (Driver) Class.forName(database_driver).newInstance();
            DriverManager.registerDriver(driver);
        } catch (Exception ex) {
            throw new RuntimeException("Cannot load/register jdbc driver: " + database_driver, ex);
        }
    }


    private Connection getPooledConnection() throws SystemException {
        Connection result;
        Context envContext = null;
        try {
            final Context initialContext = new InitialContext();
            envContext = (Context) initialContext.lookup(STANDARD_ENVIRONMENT);
            final DataSource datasource = (DataSource) envContext.lookup(database_jndi);
            result = datasource.getConnection();
        } catch (NamingException ex) {
            try {
                net.sf.dynxform.util.JNDITree.showTree("/", envContext, 0, Integer.MAX_VALUE);
            } catch (NamingException nex) {
                //nothing to do, just print out JNDI tree 
            }
            throw new ConfigurationException("Config error with JNDI and datasource.", ex);
        } catch (SQLException ex) {
            throw new DataStoreException("Cannot get JNDI connection from datasource.", ex);
        }
        return result;
    }

    private Connection getSimpleConnection() throws SystemException {
        Connection result;
        try {
            if (driver == null) loadDbDriver();
            result = DriverManager.getConnection(database_url, database_username, database_password);

        } catch (Exception ex) {
            final StringBuffer message = new StringBuffer();
            message.append("*** CANNOT CONNECT to database named: ");
            message.append(database_url + Constants.NEW_LINE);
            message.append(" User name: " + database_username + Constants.NEW_LINE);
            message.append(" Password: " + database_password + Constants.NEW_LINE);
            message.append(" Reason: " + ex + Constants.NEW_LINE);
            throw new SystemException(message.toString(), ex);
        }
        return result;
    }

    public static synchronized DatabaseConnection create() {
        if (databaseConnection == null) databaseConnection = new DatabaseConnection();
        return databaseConnection;
    }
}
--- NEW FILE: BindParameters.java ---
package net.sf.dynxform.db;

import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;

import java.util.ArrayList;

public final class BindParameters {

  public static String bind(String query, final String paramName, final Object paramValue) throws RESyntaxException {
    query = query + ' ';
    final boolean isNull = (paramValue == null);
    RE re = new RE("\\s*=\\s*(:" + paramName + ")([\\s^\\w]|[^\\w]|[\n])", RE.MATCH_CASEINDEPENDENT);
    String replaceValue = (isNull) ? "   is null" : "  =" + paramValue;
    replaceValue += "$2";

    String result;
    result = re.subst(query , replaceValue, RE.REPLACE_ALL | RE.REPLACE_BACKREFERENCES);
    if (result != null)
        query = result;


    replaceValue = (isNull) ? "  null" : "  " + paramValue;
    replaceValue += "$2";
    re = new RE("(:" + paramName + ")([\\s^\\w]|[^\\w])", RE.MATCH_CASEINDEPENDENT);
    result = re.subst(query , replaceValue, RE.REPLACE_ALL | RE.REPLACE_BACKREFERENCES);

    if (result != null)
        query = result;

    result = result.substring(0, result.length() - 1);
    return result;
  }

  public static ArrayList getQueryParameterNames(String query) {
    final ArrayList result = new ArrayList();

    query = query + ' ';
    final RE re = new RE("([\\s^\\w]|[^\\w]):(\\w*)([\\s^\\w]|[^\\w])", RE.MATCH_CASEINDEPENDENT);

    int matchIndex = 0;
    String parameterName;
    while (re.match(query, matchIndex)) {
      parameterName = re.getParen(2);
      matchIndex = re.getParenEnd(2);
      result.add(parameterName.toUpperCase());
    }
    return result;
  }
}

--- NEW FILE: StoredProcedure.java ---
/*
 * Created by IntelliJ IDEA.
 * User: yurib
 * Date: Feb 18, 2004
 * Time: 11:39:14 AM
 */
package net.sf.dynxform.db;

import net.sf.dynxform.exception.business.BusinessException;
import net.sf.dynxform.exception.business.SQLStatementException;
import net.sf.dynxform.report.schema.Parameter;
import net.sf.dynxform.report.schema.Procedure;
import net.sf.dynxform.report.schema.types.ParameterTypesEnumeration;
import net.sf.dynxform.util.Constants;
import net.sf.dynxform.util.ValueUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.lang.reflect.Field;
import java.sql.*;
import java.text.ParseException;
import java.util.*;

public final class StoredProcedure extends Query {
  private static Log log = LogFactory.getLog(StoredProcedure.class);
  private Procedure procedure;
  private List inParameters;
  private List outParameters;
  private List outResultSets;


  public StoredProcedure(final Procedure procedure, final Map parameters) throws BusinessException {
    try {
      this.setProcedure(procedure);
      this.parameters = new HashMap(parameters);
      this.query = procedure.getSqlJdbcCall();
      this.setInOutParameters();
    }
    catch (Exception e) {
      throw new BusinessException("Failed to create stored procedure " + this.getProcedure().getName(), e);
    }
  }

  private void setInOutParameters() throws BusinessException, SQLException, IllegalAccessException, NoSuchFieldException, ClassNotFoundException {
    final net.sf.dynxform.report.schema.ParameterList paramlist = getProcedure().getParameterList();
    if (paramlist == null) return;
    final Enumeration enu = paramlist.enumerateParameter();
    while (enu.hasMoreElements()) {
      createSpParameter((Parameter) enu.nextElement());
    }
  }

  private void setInParameter(final SpParameter queryParameter) {
    if (getInParameters() == null) {
      setInParameters(new ArrayList());
    }
    getInParameters().add(queryParameter);
  }

  private void setOutParameter(final SpParameter queryParameter) {
    if (getOutParameters() == null) {
      setOutParameters(new ArrayList());
    }
    getOutParameters().add(queryParameter);
  }

  private void registerInParameters(final PreparedStatement pst) throws SQLException, ParseException {
    if (getInParameters() == null) return;
    final Iterator itInKeys = getInParameters().iterator();
    while (itInKeys.hasNext()) {
      final SpParameter queryParameter = (SpParameter) itInKeys.next();
      queryParameter.register(pst);
    }
  }

  private void registerOutParameters(final PreparedStatement pst) throws SQLException, ParseException {
    if (getOutParameters() == null) return;
    final Iterator itOutKeys = getOutParameters().iterator();
    while (itOutKeys.hasNext()) {
      final SpParameter queryParameter = (SpParameter) itOutKeys.next();
      queryParameter.register(pst);
    }
  }

  protected final void prepare() throws SQLException, ParseException {
    pst = conn.prepareCall(query,
        java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE,
        java.sql.ResultSet.CONCUR_READ_ONLY);
    registerOutParameters(pst);
    registerInParameters(pst);
  }


  protected final void serialize() throws SQLStatementException {
    if (getOutParameters() == null || pst == null)
      return;
//          throw new SQLStatementException("Cannot serialize procedure call because statement or query parameter is null!");

    outputParams = new HashMap();
    //make sure output follows order as parameter order in stored procedure
    final Iterator itOutKeys = getOutParameters().iterator();
    SpParameter queryParameter;
    while (itOutKeys.hasNext()) {
      queryParameter = (SpParameter) itOutKeys.next();
      try {
        final Object obj = ((CallableStatement) pst).getObject(queryParameter.getOrder());

        if (obj == null)
          throw new SQLStatementException("Cannot find value for storage procedure output parameter: \""
              + queryParameter.getCleanValue() + "\" parameter order: " + queryParameter.getOrder());

        if (!(obj instanceof ResultSet)) {
          outputParams.put(queryParameter.getCleanValue(), obj.toString());
        }
        else {
          rs = (ResultSet) obj;
          if (getOutResultSets() == null) setOutResultSets(new ArrayList());
          getOutResultSets().add(rs);
          outputReport = ValueUtil.getReport(rs);
          outputParams.put(queryParameter.getCleanValue(), outputReport);
        }
      }
      catch (SQLException e) {
        throw new SQLStatementException("Cannot serialize procedure call result set", e);
      }
    }

    if (outputReport == null)
      outputReport = ValueUtil.getReport(outputParams);
  }

  public final void close() throws SQLException {
    if (outputReport != null && getOutResultSets() != null) {
      final Iterator it = getOutResultSets().iterator();
      while (it.hasNext()) {
        final Object obj = it.next();
        try {
          java.sql.ResultSet rs = ((java.sql.ResultSet) obj);
          rs.close();
          rs = null;
        }
        catch (NullPointerException e) {
          getLog().warn("Failed to close SP:" + name + " output result set.");
        }
      }
    }
    super.close();
  }


  protected final String getParameterValue(String paramName) {
    String paramValue = null;

    if (paramName.startsWith("parameter:")) {
      paramName = StringUtils.substringAfter(paramName, "parameter:");
      paramValue = (String) parameters.get(paramName.toLowerCase());
      if (paramValue == null)
        paramValue = (String) parameters.get(paramName.toUpperCase());
    }
    else if (paramName.startsWith("output:")) {
      paramName = StringUtils.substringAfter(paramName, "output:");
      final HashMap outParams = (HashMap) parameters.get("output");
      if (outParams != null) {
        paramValue = (String) outParams.get(paramName.toLowerCase());
        if (paramValue == null)
          paramValue = (String) outParams.get(paramName.toUpperCase());
      }
    }
    else if (paramName.startsWith("default:"))
      paramValue = StringUtils.substringAfter(paramName, "default:");
    return paramValue;

  }

  private void createSpParameter(final net.sf.dynxform.report.schema.Parameter parameter) throws IllegalAccessException, SQLException, NoSuchFieldException, BusinessException, ClassNotFoundException {
    if (parameter.getType().equals(ParameterTypesEnumeration.IN)) {
      setInParameter(new SpInParameter(parameter));
    }
    else if (parameter.getType().equals(ParameterTypesEnumeration.OUT)) {
      setOutParameter(new SpOutParameter(parameter));
    }
  }

  public final HashMap getOutParams() {
    return outputParams;
  }

  public static Log getLog() {
    return log;
  }

  public static void setLog(final Log log) {
    StoredProcedure.log = log;
  }

  public Procedure getProcedure() {
    return procedure;
  }

  public void setProcedure(final Procedure procedure) {
    this.procedure = procedure;
  }

  public List getInParameters() {
    return inParameters;
  }

  public void setInParameters(final List inParameters) {
    this.inParameters = inParameters;
  }

  public List getOutParameters() {
    return outParameters;
  }

  public void setOutParameters(final List outParameters) {
    this.outParameters = outParameters;
  }

  public List getOutResultSets() {
    return outResultSets;
  }

  public void setOutResultSets(final List outResultSets) {
    this.outResultSets = outResultSets;
  }


  abstract static class SpParameter {
    private String className;
    private String fieldName;
    private Class clss;
    private Field fld;
    private int jdbcType;
    private final int order;
    private final String name;
    private String value;
    private Object objectValue;
    private final String type;
    private final boolean isNull;

    protected SpParameter(final net.sf.dynxform.report.schema.Parameter parameter)
        throws SQLStatementException {
      this.type = parameter.getJdbcType();
      this.order = parameter.getOrder();
      this.name = parameter.getName();
      this.setValue(parameter.getValue());
      this.isNull = parameter.getIsNull();
      init();
    }

    public final int getOrder() {
      return order;
    }

    public final String getCleanValue() {
      return StringUtils.substringAfter(getValue(), ":");
    }

    final void init() throws SQLStatementException {
      final int index = getType().lastIndexOf(".");
      if (index > -1) {
        setClassName(getType().substring(0, index));
        setFieldName(getType().substring(index + 1, getType().length()));
      }
      else {
        getLog().error("Invalid SQLType: " + getType(), null);
        throw new SQLStatementException("Invalid SQLType: " + getType());
      }

      try {
        setClss(Class.forName(getClassName()));
        setFld(getClss().getField(getFieldName()));
        setJdbcType(getFld().getInt(getFieldName()));
      }
      catch (Exception ex) {
        throw new SQLStatementException("Cannot init stored procedure parameter \"" + getName() + '\"', ex);
      }
    }

    protected abstract void register(PreparedStatement pst) throws SQLException, ParseException;

    public final boolean isNull() {
      return isNull;
    }

    public final String getClassName() {
      return className;
    }

    public final void setClassName(final String className) {
      this.className = className;
    }

    public final String getFieldName() {
      return fieldName;
    }

    public final void setFieldName(final String fieldName) {
      this.fieldName = fieldName;
    }

    public final Class getClss() {
      return clss;
    }

    public final void setClss(final Class clss) {
      this.clss = clss;
    }

    public final Field getFld() {
      return fld;
    }

    public final void setFld(final Field fld) {
      this.fld = fld;
    }

    public final int getJdbcType() {
      return jdbcType;
    }

    public final void setJdbcType(final int jdbcType) {
      this.jdbcType = jdbcType;
    }

    public final String getName() {
      return name;
    }

    public final String getValue() {
      return value;
    }

    public final void setValue(final String value) {
      this.value = value;
    }

    public final Object getObjectValue() {
      return objectValue;
    }

    public final void setObjectValue(final Object objectValue) {
      this.objectValue = objectValue;
    }

    public final String getType() {
      return type;
    }
  }

  final class SpInParameter extends SpParameter {

    SpInParameter(final net.sf.dynxform.report.schema.Parameter parameter) throws SQLStatementException {
      super(parameter);

      this.setValue(getParameterValue(parameter.getValue()));
      if (this.getValue() == null)
        if (parameter.hasIsNull() && !parameter.getIsNull())
          throw new SQLStatementException("Parameter \"" + parameter.getValue() + "\"(" + parameter.getName() + ") cannot be null!");
    }

    protected final void register(final PreparedStatement pst) throws SQLException, ParseException {
      if (getLog().isDebugEnabled())
        getLog().debug("Register IN parameter: '" + getName() + "', with value " + getValue() + " with class: " + getJdbcType());
      if ((getJdbcType() == Types.DATE) || (getJdbcType() == Types.TIME) || (getJdbcType() == Types.FLOAT) || (getJdbcType() == Types.DOUBLE)) setObjectValue(convertToSQLObjectValue(getValue(), getJdbcType()));
      if (((getJdbcType() == Types.VARCHAR) || (getJdbcType() == Types.CHAR)) && (getValue() != null) && ((String) getValue()).length() == 0) setValue(" ");
      if (getObjectValue() == null) setObjectValue(getValue());
      if (getObjectValue() != null) {
        pst.setObject(getOrder(), getObjectValue());
      }
      else {
        if (!isNull())
          throw new SQLException("Parameter " + getName() + " cannot be null");
        else
          pst.setNull(getOrder(), getJdbcType());
      }
    }
  }


  static final class SpOutParameter extends SpParameter {
    SpOutParameter(final Parameter parameter) throws BusinessException {
      super(parameter);
    }

    protected final void register(final PreparedStatement pst) throws SQLException {
      if (pst instanceof CallableStatement) {
        ((CallableStatement) pst).registerOutParameter(getOrder(), getJdbcType());
      }
    }
  }

  private static Object convertToSQLObjectValue(final String paramValue, final int jdbcType) throws ParseException {
    Object returnValue = null;

    if (paramValue != null) {
      if ("".equals(paramValue))
        return null;
      if (jdbcType == Types.DATE) {
        returnValue = new java.sql.Date(Constants.dateDateFormat.parse(paramValue).getTime());
      }
      if (jdbcType == Types.TIME) {
        returnValue = new java.sql.Time(Constants.timeDateFormat.parse(paramValue).getTime());
      }
      if (jdbcType == Types.FLOAT) {
        returnValue = new Float(paramValue);
      }
      if (jdbcType == Types.DOUBLE) {
        returnValue = new Double(paramValue);
      }
    }
    return returnValue;
  }

}

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/report ReportBuilder.java,1.2,NONE

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/report

Removed Files:
	ReportBuilder.java 
Log Message:
moved all database depencies to db package

--- ReportBuilder.java DELETED ---

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/form/data/module SingleReportModule.java,1.2,1.3

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/form/data/module

Modified Files:
	SingleReportModule.java 
Log Message:
moved all database depencies to db package

Index: SingleReportModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/SingleReportModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SingleReportModule.java	11 Aug 2004 17:32:53 -0000	1.2
--- SingleReportModule.java	14 Oct 2004 12:39:44 -0000	1.3
***************
*** 8,12 ****
  import net.sf.dynxform.form.model.ReportDefinition;
  import net.sf.dynxform.form.types.Report;
! import net.sf.dynxform.report.ReportBuilder;
  
  import java.util.HashMap;
--- 8,12 ----
  import net.sf.dynxform.form.model.ReportDefinition;
  import net.sf.dynxform.form.types.Report;
! import net.sf.dynxform.db.report.ReportBuilder;
  
  import java.util.HashMap;

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/action DefaultActionSelector.java,1.1,1.2 DatabaseAction.java,1.2,NONE DatabaseActionExecutor.java,1.2,NONE DatabaseActionPool.java,1.2,NONE

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/action

Modified Files:
	DefaultActionSelector.java 
Removed Files:
	DatabaseAction.java DatabaseActionExecutor.java 
	DatabaseActionPool.java 
Log Message:
moved all database depencies to db package

Index: DefaultActionSelector.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/action/DefaultActionSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultActionSelector.java	19 Jul 2004 11:55:48 -0000	1.1
--- DefaultActionSelector.java	14 Oct 2004 12:39:42 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
  
  import net.sf.dynxform.form.schema.types.ActType;
+ import net.sf.dynxform.db.action.DatabaseAction;
  
  /**

--- DatabaseActionPool.java DELETED ---

--- DatabaseAction.java DELETED ---

--- DatabaseActionExecutor.java DELETED ---

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/database BindParameters.java,1.2,NONE DatabaseConnection.java,1.2,NONE Query.java,1.2,NONE StoredProcedure.java,1.2,NONE

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/database

Removed Files:
	BindParameters.java DatabaseConnection.java Query.java 
	StoredProcedure.java 
Log Message:
moved all database depencies to db package

--- Query.java DELETED ---

--- DatabaseConnection.java DELETED ---

--- BindParameters.java DELETED ---

--- StoredProcedure.java DELETED ---

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db/report ReportBuilder.java,NONE,1.1

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6850/db/report

Added Files:
	ReportBuilder.java 
Log Message:
moved all database depencies to db package

--- NEW FILE: ReportBuilder.java ---
package net.sf.dynxform.db.report;

import net.sf.dynxform.db.DatabaseConnection;
import net.sf.dynxform.db.Query;
import net.sf.dynxform.db.StoredProcedure;
import net.sf.dynxform.exception.business.BusinessException;
import net.sf.dynxform.exception.system.SystemException;
import net.sf.dynxform.form.types.Report;
import net.sf.dynxform.report.ReportPool;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.util.Map;

/**
 * $Id: ReportBuilder.java,v 1.1 2004/10/14 12:39:44 ebacker Exp $
 * Copyright (c) dynxform.sf.net. All Rights Reserved.
 */
public final class ReportBuilder {
  static final Log log = LogFactory.getLog(ReportBuilder.class);
  private static final DatabaseConnection databaseConnection = DatabaseConnection.create();

  public static Report buildReport(final net.sf.dynxform.report.schema.Report report, final Map parameters) throws SystemException, BusinessException {
    Query query;
    try {
      if (report.getStoredProcedureChoice() == null || report.getStoredProcedureChoice().getProcedure() == null)
        query = new Query(report, parameters);
      else
        query = new StoredProcedure(report.getStoredProcedureChoice().getProcedure(), parameters);
    }
    catch (Exception ex) {
      throw new BusinessException("Cannot build report with GUID \"" + report.getGuid() + '\"', ex);
    }
    query.setConnection(databaseConnection.get());
    query.execute();
    return query.getReport();
  }

  public static Report buildResultSets(final String reportID, final Map parameters) throws SystemException, BusinessException {
    final ReportPool pool = ReportPool.getInstance();
    net.sf.dynxform.report.schema.Report report = null;
    try {
      try {
        report = (net.sf.dynxform.report.schema.Report) pool.borrowObject(reportID);
      }
      catch (Exception e) {
        throw new BusinessException("Cannot get " + reportID + " from pool", e);
      }

      return buildReport(report, parameters);
    }
    finally {
      try {
        if (report != null) {
          pool.returnObject(reportID, report);
        }
      }
      catch (Exception e) {
        log.error("Failed to return report" + reportID + " to pool", e);
      }
    }
  }

}

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db/action - New directory

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6605/action

Log Message:
Directory /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/action added to the repository

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db/report - New directory

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6547/report

Log Message:
Directory /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db/report added to the repository

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/db - New directory

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1919/db

Log Message:
Directory /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/db added to the repository

[Dynxform-commits] dynxform/src/resources/demo/script dynform.js,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/resources/demo/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14046/resources/demo/script

Modified Files:
	dynform.js 
Log Message:
fixed bug with font changes when user click on table row

Index: dynform.js
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/resources/demo/script/dynform.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dynform.js	19 Jul 2004 11:55:51 -0000	1.1
--- dynform.js	14 Oct 2004 10:50:19 -0000	1.2
***************
*** 51,55 ****
    	cur_table.oldStyle = cur_row.className;
  
! 	cur_row.className="column_selected";
  	cells = cur_row.cells;
  
--- 51,55 ----
    	cur_table.oldStyle = cur_row.className;
  
! 	//cur_row.className="column_selected";
  	cells = cur_row.cells;
  

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon/acting DynamicFormSubmitAction.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13656/acting

Modified Files:
	DynamicFormSubmitAction.java 
Log Message:
[refactoring] moved to cocoon package since is used only from cocoon


Index: DynamicFormSubmitAction.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting/DynamicFormSubmitAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DynamicFormSubmitAction.java	19 Jul 2004 11:55:48 -0000	1.1
--- DynamicFormSubmitAction.java	14 Oct 2004 10:48:25 -0000	1.2
***************
*** 1,5 ****
  package net.sf.dynxform.container.cocoon.acting;
  
! import net.sf.dynxform.container.DefinitionProviderConfigurator;
  import net.sf.dynxform.form.DynamicFormManager;
  import net.sf.dynxform.form.FormCreator;
--- 1,6 ----
  package net.sf.dynxform.container.cocoon.acting;
  
! import net.sf.dynxform.container.cocoon.DefinitionProviderConfigurator;
! import net.sf.dynxform.container.cocoon.DefinitionProviderConfigurator;
  import net.sf.dynxform.form.DynamicFormManager;
  import net.sf.dynxform.form.FormCreator;

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon/generation AbstractFormGenerator.java,1.3,1.4

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13656/generation

Modified Files:
	AbstractFormGenerator.java 
Log Message:
[refactoring] moved to cocoon package since is used only from cocoon


Index: AbstractFormGenerator.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation/AbstractFormGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractFormGenerator.java	12 Aug 2004 18:34:06 -0000	1.3
--- AbstractFormGenerator.java	14 Oct 2004 10:48:25 -0000	1.4
***************
*** 2,8 ****
  
  import net.sf.dynxform.container.DefinitionProvider;
! import net.sf.dynxform.container.DefinitionProviderConfigurator;
  import net.sf.dynxform.container.ResourceLocator;
  import net.sf.dynxform.container.cocoon.RequestHelper;
  import net.sf.dynxform.container.cocoon.generation.load.CocoonFacade;
  import net.sf.dynxform.form.FormManager;
--- 2,9 ----
  
  import net.sf.dynxform.container.DefinitionProvider;
! import net.sf.dynxform.container.cocoon.DefinitionProviderConfigurator;
  import net.sf.dynxform.container.ResourceLocator;
  import net.sf.dynxform.container.cocoon.RequestHelper;
+ import net.sf.dynxform.container.cocoon.DefinitionProviderConfigurator;
  import net.sf.dynxform.container.cocoon.generation.load.CocoonFacade;
  import net.sf.dynxform.form.FormManager;

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container DefinitionProviderConfigurator.java,1.2,NONE

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13520

Removed Files:
	DefinitionProviderConfigurator.java 
Log Message:
[refactoring] moved to cocoon package since is used only from cocoon


--- DefinitionProviderConfigurator.java DELETED ---

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon DefinitionProviderConfigurator.java,NONE,1.1

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13520/cocoon

Added Files:
	DefinitionProviderConfigurator.java 
Log Message:
[refactoring] moved to cocoon package since is used only from cocoon


--- NEW FILE: DefinitionProviderConfigurator.java ---
package net.sf.dynxform.container.cocoon;

import net.sf.dynxform.container.cocoon.generation.load.CocoonResourceLocator;
import net.sf.dynxform.container.DefinitionProvider;
import org.apache.avalon.framework.parameters.Parameters;

/**
 * net.sf.dynxform.container Apr 26, 2004 12:57:44 PM andreyp
 * Copyright (c) dynxform.sf.net. All Rights Reserved
 * 
 * @author <a href="mailto:an...@sf...">andreyp</a>
 */
public final class DefinitionProviderConfigurator {

  public static void configure(final Parameters parameters) {
    final CocoonResourceLocator resourceLocator = new CocoonResourceLocator();
    resourceLocator.setActionLocation(parameters.getParameter("actions-dir", null));
    resourceLocator.setFormLocation(parameters.getParameter("forms-dir", null));
    resourceLocator.setReportLocation(parameters.getParameter("reports-dir", null));
    DefinitionProvider.getInstance().configure(resourceLocator);
  }
}

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon/generation AbstractFormGenerator.java,1.2,1.3 TranslatedFormCacheGenerator.java,1.2,1.3

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/java/net/sf/dynxform/container/cocoon/generation

Modified Files:
	AbstractFormGenerator.java TranslatedFormCacheGenerator.java 
Log Message:
renamed spp param to guid

Index: TranslatedFormCacheGenerator.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation/TranslatedFormCacheGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TranslatedFormCacheGenerator.java	11 Aug 2004 17:32:50 -0000	1.2
--- TranslatedFormCacheGenerator.java	12 Aug 2004 18:34:06 -0000	1.3
***************
*** 39,43 ****
     * ID form
     */
!   private String spp = null;
  
    /**
--- 39,43 ----
     * ID form
     */
!   private String guid = null;
  
    /**
***************
*** 93,97 ****
          }
        }
!       spp = par.getParameter("spp", "");
        cacheDir = par.getParameter("cache-dir", "");
        formsDir = par.getParameter("forms-dir", "");
--- 93,97 ----
          }
        }
!       guid = par.getParameter("guid", "");
        cacheDir = par.getParameter("cache-dir", "");
        formsDir = par.getParameter("forms-dir", "");
***************
*** 103,107 ****
          }
        }
!       if (spp == null || spp.trim().length() == 0 || cacheDir == null || cacheDir.trim().length() == 0) {
          useCache = false;
        }
--- 103,107 ----
          }
        }
!       if (guid == null || guid.trim().length() == 0 || cacheDir == null || cacheDir.trim().length() == 0) {
          useCache = false;
        }
***************
*** 112,116 ****
          if (!checkCache()) {
            if (log.isDebugEnabled()) {
!             log.debug("The translation of form \""+spp+"\" does not exist in cache.");
            }
            inputSource = resolver.resolveURI(src);
--- 112,116 ----
          if (!checkCache()) {
            if (log.isDebugEnabled()) {
!             log.debug("The translation of form \""+guid+"\" does not exist in cache.");
            }
            inputSource = resolver.resolveURI(src);
***************
*** 126,132 ****
              new File(cacheDir + languageId + '/').mkdirs();
              if (log.isDebugEnabled()) {
!               log.debug("Store form in cache - \""+cacheDir + languageId + '/'+ spp + ".xml"+"\".");
              }
!             final FileOutputStream fos = new FileOutputStream(cacheDir + languageId + '/'+ spp + ".xml");
              fos.write(byteArr);
              fos.close();
--- 126,132 ----
              new File(cacheDir + languageId + '/').mkdirs();
              if (log.isDebugEnabled()) {
!               log.debug("Store form in cache - \""+cacheDir + languageId + '/'+ guid + ".xml"+"\".");
              }
!             final FileOutputStream fos = new FileOutputStream(cacheDir + languageId + '/'+ guid + ".xml");
              fos.write(byteArr);
              fos.close();
***************
*** 139,145 ****
          } else {
            if (log.isDebugEnabled()) {
!             log.debug("The translation of form \""+spp+"\" lie in cache.");
            }
!           inputSource = new FileSource(cacheDir + languageId + '/'+ spp + ".xml");
          }
        }
--- 139,145 ----
          } else {
            if (log.isDebugEnabled()) {
!             log.debug("The translation of form \""+guid+"\" lie in cache.");
            }
!           inputSource = new FileSource(cacheDir + languageId + '/'+ guid + ".xml");
          }
        }
***************
*** 191,195 ****
     */
    private boolean checkCache() {
!     final File cachedFile = new File(cacheDir + languageId + '/'+ spp + ".xml");
      if (formsDir == null || formsDir.trim().length() == 0) {
        if (log.isDebugEnabled()) {
--- 191,195 ----
     */
    private boolean checkCache() {
!     final File cachedFile = new File(cacheDir + languageId + '/'+ guid + ".xml");
      if (formsDir == null || formsDir.trim().length() == 0) {
        if (log.isDebugEnabled()) {
***************
*** 198,202 ****
        return false;
      }
!     final File formFile = new File(formsDir + '/'+ spp + ".xml");
      boolean retVal = false;
      if (cachedFile.exists() && formFile.exists()) {
--- 198,202 ----
        return false;
      }
!     final File formFile = new File(formsDir + '/'+ guid + ".xml");
      boolean retVal = false;
      if (cachedFile.exists() && formFile.exists()) {

Index: AbstractFormGenerator.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation/AbstractFormGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractFormGenerator.java	11 Aug 2004 17:32:50 -0000	1.2
--- AbstractFormGenerator.java	12 Aug 2004 18:34:06 -0000	1.3
***************
*** 51,58 ****
        }
        final Form form = getForm(targetForm,
!           (String) request.getAttribute("spp"),
            RequestHelper.isReloadForm(request));
        if (log.isDebugEnabled()) {
!         log.debug("Set target form spp:" + ((form != null) ? form.getGuid() : null));
        }
  
--- 51,58 ----
        }
        final Form form = getForm(targetForm,
!           (String) request.getAttribute("guid"),
            RequestHelper.isReloadForm(request));
        if (log.isDebugEnabled()) {
!         log.debug("Set target form guid:" + ((form != null) ? form.getGuid() : null));
        }
  

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon/acting AbstractSubmitAction.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/java/net/sf/dynxform/container/cocoon/acting

Modified Files:
	AbstractSubmitAction.java 
Log Message:
renamed spp param to guid

Index: AbstractSubmitAction.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting/AbstractSubmitAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractSubmitAction.java	19 Jul 2004 11:55:48 -0000	1.1
--- AbstractSubmitAction.java	12 Aug 2004 18:34:07 -0000	1.2
***************
*** 26,30 ****
  
    private static final String TARGET_FORM = "target";
!   private static final String FORM_ID = "spp";
  
  
--- 26,30 ----
  
    private static final String TARGET_FORM = "target";
!   private static final String FORM_ID = "guid";
  
  
***************
*** 40,44 ****
    public final Map act(final Redirector redirector, final SourceResolver sourceResolver, final Map objectModel, final String string, final Parameters parameters) throws Exception {
      final org.apache.cocoon.environment.Request request = ObjectModelHelper.getRequest(objectModel);
!     final String formSpp = parameters.getParameter(FORM_ID);
      final Map outputParameters = new HashMap();
      cocoonProducerFactory.setup(request);
--- 40,44 ----
    public final Map act(final Redirector redirector, final SourceResolver sourceResolver, final Map objectModel, final String string, final Parameters parameters) throws Exception {
      final org.apache.cocoon.environment.Request request = ObjectModelHelper.getRequest(objectModel);
!     final String formGuid = parameters.getParameter(FORM_ID);
      final Map outputParameters = new HashMap();
      cocoonProducerFactory.setup(request);
***************
*** 46,56 ****
  
      if (log.isDebugEnabled())
!       log.debug("Validate form \"" + formSpp + '\"');
  
!     if (!getFormManager().validateForm(formSpp)) {
        if (log.isDebugEnabled())
!         log.debug("Form \"" + formSpp + "\" data is invalid");
        RequestHelper.setReloadForm(request, true);
!       outputParameters.put(TARGET_FORM, formSpp);
        return outputParameters;
      }
--- 46,56 ----
  
      if (log.isDebugEnabled())
!       log.debug("Validate form \"" + formGuid + '\"');
  
!     if (!getFormManager().validateForm(formGuid)) {
        if (log.isDebugEnabled())
!         log.debug("Form \"" + formGuid + "\" data is invalid");
        RequestHelper.setReloadForm(request, true);
!       outputParameters.put(TARGET_FORM, formGuid);
        return outputParameters;
      }
***************
*** 62,66 ****
      final CocoonFlowController controller = (CocoonFlowController) formContext.getFlowController();
      controller.forward(null);
!     getFormManager().submitForm(formSpp);
  
      if (log.isDebugEnabled())
--- 62,66 ----
      final CocoonFlowController controller = (CocoonFlowController) formContext.getFlowController();
      controller.forward(null);
!     getFormManager().submitForm(formGuid);
  
      if (log.isDebugEnabled())
***************
*** 69,73 ****
      String targetForm = controller.getForwardedForm();
      if (targetForm == null) {
!       targetForm = formSpp;
        RequestHelper.setReloadForm(request, true);
      }
--- 69,73 ----
      String targetForm = controller.getForwardedForm();
      if (targetForm == null) {
!       targetForm = formGuid;
        RequestHelper.setReloadForm(request, true);
      }

[Dynxform-commits] dynxform/src/resources/demo sitemap.xmap,1.2,1.3

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/resources/demo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28174

Modified Files:
	sitemap.xmap 
Log Message:
renamed spp param to guid

Index: sitemap.xmap
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/resources/demo/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sitemap.xmap	11 Aug 2004 17:32:57 -0000	1.2
--- sitemap.xmap	12 Aug 2004 17:37:46 -0000	1.3
***************
*** 122,126 ****
  			<map:match pattern="">
  				<map:act type="request-propagator">
! 					<map:parameter name="spp" value="customers"/>
  				</map:act>
  				<map:redirect-to uri="cocoon:/form"/>
--- 122,126 ----
  			<map:match pattern="">
  				<map:act type="request-propagator">
! 					<map:parameter name="guid" value="customers"/>
  				</map:act>
  				<map:redirect-to uri="cocoon:/form"/>
***************
*** 131,135 ****
  			<map:match pattern="form">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{chain:spp}">
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
--- 131,135 ----
  			<map:match pattern="form">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{chain:guid}">
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
***************
*** 153,158 ****
  								</map:transform>
  							</map:when>
! 							<map:when test="{context}/dynxform/xsl/{chain:spp}.xsl">
! 								<map:transform src="xsl/{chain:spp}.xsl">
  									<map:parameter name="submit-action" value="form.submit"/>
  								</map:transform>
--- 153,158 ----
  								</map:transform>
  							</map:when>
! 							<map:when test="{context}/dynxform/xsl/{chain:guid}.xsl">
! 								<map:transform src="xsl/{chain:guid}.xsl">
  									<map:parameter name="submit-action" value="form.submit"/>
  								</map:transform>
***************
*** 173,182 ****
  				<map:act type="session"/>
  				<map:act type="form.submit">
! 					<map:parameter name="spp" value="{request-param:dynform_guid}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:act type="request-propagator">
! 						<map:parameter name="spp" value="{target}"/>
  						<map:parameter name="submited-form" value="{request-param:dynform_guid}"/>
  					</map:act>
--- 173,182 ----
  				<map:act type="session"/>
  				<map:act type="form.submit">
! 					<map:parameter name="guid" value="{request-param:dynform_guid}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:act type="request-propagator">
! 						<map:parameter name="guid" value="{target}"/>
  						<map:parameter name="submited-form" value="{request-param:dynform_guid}"/>
  					</map:act>
***************
*** 190,199 ****
  		<map:pipeline>
  			<map:match pattern="dynform.prepare">
! 				<map:generate type="form" src="{chain:spp}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
  				</map:generate>
! 				<map:transform src="xsl/{chain:spp}.prepare.xsl"/>
  				<map:serialize type="xml"/>
  			</map:match>
--- 190,199 ----
  		<map:pipeline>
  			<map:match pattern="dynform.prepare">
! 				<map:generate type="form" src="{chain:guid}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
  				</map:generate>
! 				<map:transform src="xsl/{chain:guid}.prepare.xsl"/>
  				<map:serialize type="xml"/>
  			</map:match>
***************
*** 224,229 ****
  								</map:transform>
  							</map:when>
! 							<map:when test="{context}/dynxform/xsl/{chain:spp}.xsl">
! 								<map:transform src="xsl/{chain:spp}.xsl">
  									<map:parameter name="submit-action" value="dynform.submit"/>
  								</map:transform>
--- 224,229 ----
  								</map:transform>
  							</map:when>
! 							<map:when test="{context}/dynxform/xsl/{chain:guid}.xsl">
! 								<map:transform src="xsl/{chain:guid}.xsl">
  									<map:parameter name="submit-action" value="dynform.submit"/>
  								</map:transform>
***************
*** 244,253 ****
  				<map:act type="session"/>
  				<map:act type="request-propagator">
! 					<map:parameter name="spp" value="{request-param:dynform_guid}"/>
  				</map:act>
  				<!-- map:redirect-to uri="cocoon:/dynform.prepare"/ -->
  				<map:act type="dynform.submit">
  					<map:parameter name="src" value="cocoon:/dynform.prepare"/>
! 					<map:parameter name="spp" value="{request-param:dynform_guid}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
--- 244,253 ----
  				<map:act type="session"/>
  				<map:act type="request-propagator">
! 					<map:parameter name="guid" value="{request-param:dynform_guid}"/>
  				</map:act>
  				<!-- map:redirect-to uri="cocoon:/dynform.prepare"/ -->
  				<map:act type="dynform.submit">
  					<map:parameter name="src" value="cocoon:/dynform.prepare"/>
! 					<map:parameter name="guid" value="{request-param:dynform_guid}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
***************
*** 255,259 ****
  					<map:act type="request-propagator">
  						<!-- TODO: Add forward to other forms not for current -->
! 						<map:parameter name="spp" value="{target}"/>
  						<map:parameter name="submited-form" value="{request-param:dynform_guid}"/>
  					</map:act>
--- 255,259 ----
  					<map:act type="request-propagator">
  						<!-- TODO: Add forward to other forms not for current -->
! 						<map:parameter name="guid" value="{target}"/>
  						<map:parameter name="submited-form" value="{request-param:dynform_guid}"/>
  					</map:act>
***************
*** 268,272 ****
  			<map:match pattern="xml">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{request-param:spp}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
--- 268,272 ----
  			<map:match pattern="xml">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{request-param:guid}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
***************
*** 284,288 ****
  			<map:match pattern="xform">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{request-param:spp}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
--- 284,288 ----
  			<map:match pattern="xform">
  				<map:act type="session"/>
! 				<map:generate type="form" src="{request-param:guid}">
  					<map:parameter name="actions-dir" value="file://{realpath:/}{global:action-path}"/>
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
***************
*** 297,301 ****
  		<map:pipeline>
  			<map:match pattern="preview-form">
! 				<map:generate type="preview-form" src="{request-param:spp}">
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>
--- 297,301 ----
  		<map:pipeline>
  			<map:match pattern="preview-form">
! 				<map:generate type="preview-form" src="{request-param:guid}">
  					<map:parameter name="forms-dir" value="file://{realpath:/}{global:form-path}"/>
  					<map:parameter name="reports-dir" value="file://{realpath:/}{global:report-path}"/>

[Dynxform-commits] dynxform build.properties.default,1.1,NONE

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10009

Removed Files:
	build.properties.default 
Log Message:
removed since not needed anymore ;)

--- build.properties.default DELETED ---

[Dynxform-commits] dynxform build.number,1.1,1.2 build.properties,1.1,1.2 build.xml,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9736

Modified Files:
	build.number build.properties build.xml 
Log Message:
build refactoring

Index: build.number
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.number,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.number	19 Jul 2004 11:47:30 -0000	1.1
--- build.number	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,3 ****
  #Build Number for ANT. Do not edit!
! #Mon Jul 19 11:51:51 MSD 2004
! build.number=29
--- 1,3 ----
  #Build Number for ANT. Do not edit!
! #Sun Aug 08 21:40:33 MSD 2004
! build.number=57

Index: build.xml
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	19 Jul 2004 11:47:30 -0000	1.1
--- build.xml	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,204 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project default="" name="dynxform">
!   <property name="base.dir" value="."/>
!   <property name="src.dir" value="${base.dir}/src"/>
!   <property name="web.src.dir" value="${src.dir}"/>
!   <property name="lib.dir" value="${base.dir}/lib"/>
!   <property name="var.dir" value="${base.dir}/var"/>
!   <property name="lib.cocoon.dir" value="${base.dir}/lib/cocoon"/>
!   <property name="xmltestsuite.dir" value="${lib.dir}/tests/xmltestsuite"/>
! 
!   <property name="lib.src.dir" value="${base.dir}/lib/src"/>
!   <property name="build.dir" value="${base.dir}/build"/>
!   <property name="build.classes.dir" value="${build.dir}/classes"/>
!   <property name="junit.results.dir" value="${var.dir}/reports/"/>
! 
!   <property name="src.java.dir" value="${src.dir}/java"/>
!   <property name="resources.dir" value="${src.dir}/resources"/>
!   <property name="properties.dir" value="${resources.dir}/properties"/>
!   <property name="xsd.resources.dir" value="${resources.dir}/xsd"/>
!   <property file="build.properties"/>
!   <property name="dist.dir" value="${base.dir}/distr"/>
! 
!   <property name="cocoon.dir" value="${tomcat.webapp.path}/cocoon"/>
! 
!   <property name="dynxform.jar.file" value="dynxform.jar"/>
! 
!   <path id="classpath">
!     <fileset dir="${lib.dir}">
!       <include name="*.jar"/>
!       <include name="cocoon/*.jar"/>
!       <include name="tests/*.jar"/>
!     </fileset>
!     <pathelement path="${build.classes.dir}"/>
!     <pathelement path="${src.java.dir}"/>
!   </path>
! 
!   <target name="clean">
!     <delete includeemptydirs="true" failonerror="false">
!       <fileset dir="${build.dir}">
!         <include name="**/**"/>
!       </fileset>
!     </delete>
!     <mkdir dir="${build.dir}"/>
!     <mkdir dir="${build.dir}/classes"/>
!     <mkdir dir="${build.dir}/output"/>
!   </target>
!   <target name="compile" depends="clean">
!     <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" deprecation="true" classpathref="classpath" source="1.3">
!       <exclude name="advsearch/*.java"/>
!       <exclude name="**/database/sp/**"/>
!       <exclude name="**/canoo/**"/>
!     </javac>
!     <buildnumber/>
! 
!     <jar jarfile="${build.dir}/${dynxform.jar.file}">
!       <!--      package version identification: http://java.sun.com/products/jdk/1.2/docs/guide/versioning/index.html-->
!       <manifest>
!         <attribute name="Implementation-Version" value="${MajorVersion}.${MinorVersion}.${ReleaseVersion} build ${build.number}"/>
!         <attribute name="Built-By" value="${user.name}"/>
!       </manifest>
!       <fileset dir="${build.classes.dir}">
!         <exclude name="net/sf/dynxform/container/test/**"/>
!         <exclude name="net/sf/dynxform/test/**"/>
!         <exclude name="net/sf/dynxform/database/sp/**"/>
!         <exclude name="net/sf/dynxform/canoo/**"/>
!       </fileset>
!     </jar>
!   </target>
! 
!   <target name="xsd2java.form">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/form/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <!--
!     Castor
!     Usage: -i filename [-package package-name] [-dest dest-dir] [-line-separator ( unix | mac | win)] [-f ] [-h ] [-verbose ] [-nodesc ] [-types types] [-type-factory classname] [-nomarshall ] [-testable ] [-sax1 ] [-binding-file filename]
!                                     -package net.sf.dynxform.schema
!         -->
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/dynform.xsd -types j2 -package net.sf.dynxform.form.schema"/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.action">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/action/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/report/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/action.xsd -types j2 -binding-file ../resources/xsd/binding.xml"/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.report">
!     <delete failonerror="false">
!       <fileset dir="${src.java.dir}/net/sf/dynxform/report/schema">
!         <include name="**/*.java"/>
!       </fileset>
!     </delete>
!     <java classpathref="classpath" classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.java.dir}">
!       <arg line=" -i ../resources/xsd/report.xsd -types j2 -package net.sf.dynxform.report.schema "/>
!     </java>
!   </target>
! 
!   <target name="xsd2java.generation" depends="xsd2java.report,xsd2java.action,xsd2java.form"/>
! 
!   <target name="junit.tests" depends="compile">
!     <junit fork="yes" haltonfailure="false">
!       <classpath>
!         <path refid="classpath"/>
!         <pathelement location="${build.dir}"/>
!         <pathelement location="${resources.dir}/properties"/>
!         <pathelement location="${resources.dir}/xml/test"/>
!       </classpath>
!       <formatter type="plain" usefile="false"/>
!       <formatter type="xml"/>
!       <batchtest todir="${junit.results.dir}">
!         <fileset dir="${build.dir}/classes">
!           <include name="**/*Test.class"/>
!         </fileset>
!       </batchtest>
!     </junit>
! 
!     <tstamp>
!       <format pattern="dd.MM.yyyy-HH.mm" property="report.dir"/>
!     </tstamp>
! 
!     <mkdir dir="${junit.results.dir}/html/${report.dir}"/>
!     <junitreport>
!       <report format="frames" todir="${junit.results.dir}/html/${report.dir}"/>
!       <fileset dir="${junit.results.dir}">
!         <include name="*.xml"/>
!       </fileset>
!     </junitreport>
!   </target>
! 
!   <target name="deploy" depends="prepare.distr.full">
!     <delete includeemptydirs="true">
!       <fileset dir="${tomcat.webapp.path}">
!         <include name="cocoon/dynxform/**"/>
!         <include name="resources.war"/>
!         <include name="resources/**"/>
!       </fileset>
!     </delete>
! 
!     <copy todir="${tomcat.webapp.path}" overwrite="true">
!       <fileset dir="${dist.dir}" defaultexcludes="no">
!         <include name="**/**"/>
!       </fileset>
!     </copy>
!   </target>
! 
!   <target name="prepare.dist.clean">
!     <delete dir="${dist.dir}" includeemptydirs="true"/>
!     <mkdir dir="${dist.dir}"/>
!     <mkdir dir="${dist.dir}/cocoon"/>
!     <mkdir dir="${dist.dir}/cocoon/dynxform"/>
!     <mkdir dir="${dist.dir}/cocoon/WEB-INF"/>
!     <mkdir dir="${dist.dir}/cocoon/WEB-INF/lib"/>
!   </target>
! 
!   <target name="prepare.dist" depends="prepare.dist.clean, compile">
!     <war warfile="${dist.dir}/resources.war" webxml="${resources.dir}/xml/web.xml">
!       <fileset dir="${resources.dir}/demo/images">
!         <include name="images/**"/>
!       </fileset>
!     </war>
! 
!     <copy todir="${dist.dir}/cocoon/dynxform">
!       <fileset dir="${resources.dir}/demo" defaultexcludes="no">
!         <exclude name="images/**"/>
!       </fileset>
!     </copy>
! 
!     <copy todir="${dist.dir}/cocoon/WEB-INF/lib" file="${build.dir}/${dynxform.jar.file}"/>
!   </target>
! 
!   <target name="prepare.distr.full" depends="prepare.dist">
!     <copy todir="${dist.dir}/cocoon/WEB-INF/lib">
!       <fileset dir="${lib.dir}">
!         <include name="commons-pool-1.1.jar"/>
!         <include name="jakarta-oro-2.0.7.jar"/>
!         <include name="commons-validator.jar"/>
!       </fileset>
!     </copy>
!     <copy file="${lib.dir}/saxon/saxon7.jar" tofile="${dist.dir}/cocoon/WEB-INF/lib/zsaxon7.jar"/>
! 
!     <copy todir="${dist.dir}/cocoon/WEB-INF/classes">
!       <fileset dir="${resources.dir}/properties">
!         <include name="commons-logging.properties"/>
!         <include name="db.properties"/>
!         <include name="log4j.properties"/>
!       </fileset>
!     </copy>
!   </target>
  </project>
\ No newline at end of file
--- 1,7 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project default="help" name="dynxform">
!   <import file="etc/ant/properties.xml"/>
!   <import file="etc/ant/help.xml"/>
!   <import file="etc/ant/tomcat.xml"/>
!   <import file="etc/ant/main.xml"/>
  </project>
\ No newline at end of file

Index: build.properties
===================================================================
RCS file: /cvsroot/dynxform/dynxform/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.properties	19 Jul 2004 11:47:30 -0000	1.1
--- build.properties	11 Aug 2004 17:34:28 -0000	1.2
***************
*** 1,9 ****
! # General properties
! MajorVersion=1
! MinorVersion=0
! ReleaseVersion=0
! ServiceName= 
! ServiceVersion= 
! 
! #Tomcat
! tomcat.webapp.path=C:/java/jakarta-tomcat4.1.30/webapps
--- 1,6 ----
! Major.Version=1
! Minor.Version=0
! Release.Version=0
! Service.Name= 
! Service.Version= 
! Build.Number=57

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/form/schema Act.java,1.1,1.2 ActDescriptor.java,1.1,1.2 Action.java,1.1,1.2 ActionDescriptor.java,1.1,1.2 CalculatedValue.java,1.1,1.2 CalculatedValueDescriptor.java,1.1,1.2 Chain.java,1.1,1.2 ChainDescriptor.java,1.1,1.2 ChainItem.java,1.1,1.2 ChainItemDescriptor.java,1.1,1.2 ChainType.java,1.1,1.2 ChainTypeDescriptor.java,1.1,1.2 Column.java,1.1,1.2 ColumnDescriptor.java,1.1,1.2 Concat.java,1.1,1.2 ConcatDescriptor.java,1.1,1.2 ConcatItem.java,1.1,1.2 ConcatItemDescriptor.java,1.1,1.2 ConcatType.java,1.1,1.2 ConcatTypeDescriptor.java,1.1,1.2 CreditCard.java,1.1,1.2 CreditCardDescriptor.java,1.1,1.2 CurrentRow.java,1.1,1.2 CurrentRowDescriptor.java,1.1,1.2 Data_value.java,1.1,1.2 Data_valueDescriptor.java,1.1,1.2 DateValidator.java,1.1,1.2 DateValidatorDescriptor.java,1.1,1.2 Daterange.java,1.1,1.2 DaterangeDescriptor.java,1.1,1.2 Email.java,1.1,1.2 EmailDescriptor.java,1.1,1.2 Enable.java,1.1,1.2 EnableDescriptor.java,1.1,1.2 Field.java,1.1,1.2 FieldDescriptor.java,1.1,1.2 FieldValidator.java,1.1,1.2 FieldValidatorChoice.java,1.1,1.2 FieldValidatorChoiceDescriptor.java,1.1,1.2 FieldValidatorDescriptor.java,1.1,1.2 Form.java,1.1,1.2 FormDescriptor.java,1.1,1.2 ForwardParameter.java,1.1,1.2 ForwardParameterDescriptor.java,1.1,1.2 ForwardParameterType.java,1.1,1.2 ForwardParameterTypeDescriptor.java,1.1,1.2 Grid.java,1.1,1.2 GridBody.java,1.1,1.2 GridBodyDescriptor.java,1.1,1.2 GridColumn.java,1.1,1.2 GridColumnDescriptor.java,1.1,1.2 GridData.java,1.1,1.2 GridDataDescriptor.java,1.1,1.2 GridDataType.java,1.1,1.2 GridDataTypeDescriptor.java,1.1,1.2 GridDefinition.java,1.1,1.2 GridDefinitionDescriptor.java,1.1,1.2 GridDescriptor.java,1.1,1.2 Group.java,1.1,1.2 GroupDescriptor.java,1.1,1.2 Headers.java,1.1,1.2 HeadersDescriptor.java,1.1,1.2 Inrange.java,1.1,1.2 InrangeDescriptor.java,1.1,1.2 Item.java,1.1,1.2 ItemDescriptor.java,1.1,1.2 Layout.java,1.1,1.2 LayoutDescriptor.java,1.1,1.2 Length.java,1.1,1.2 LengthDescriptor.java,1.1,1.2 ListDefinition.java,1.1,1.2 ListDefinitionDescriptor.java,1.1,1.2 ListItem.java,1.1,1.2 ListItemDescriptor.java,1.1,1.2 Mask_value.java,1.1,1.2 Mask_valueDescriptor.java,1.1,1.2 Name.java,1.1,1.2 NameDescriptor.java,1.1,1.2 Output.java,1.1,1.2 OutputDescriptor.java,1.1,1.2 OutputParameter.java,1.1,1.2 OutputParameterDescriptor.java,1.1,1.2 OutputParameterType.java,1.1,1.2 OutputParameterTypeDescriptor.java,1.1,1.2 Parameter.java,1.1,1.2 ParameterDescriptor.java,1.1,1.2 Range.java,1.1,1.2 RangeDescriptor.java,1.1,1.2 Regexp.java,1.1,1.2 RegexpDescriptor.java,1.1,1.2 Regexp_value.java,1.1,1.2 Regexp_valueDescriptor.java,1.1,1.2 Report.java,1.1,1.2 ReportDescriptor.java,1.1,1.2 ReportList.java,1.1,1.2 ReportListDescriptor.java,1.1,1.2 ReportRef.java,1.1,1.2 ReportRefDescriptor.java,1.1,1.2 ReportReferenceType.java,1.1,1.2 ReportReferenceTypeDescriptor.java,1.1,1.2 RequestParameter.java,1.1,1.2 RequestParameterDescriptor.java,1.1,1.2 RequestParameterType.java,1.1,1.2 RequestParameterTypeDescriptor.java,1.1,1.2 ResultSet.java,1.1,1.2 ResultSetDescriptor.java,1.1,1.2 ResultSetType.java,1.1,1.2 ResultSetTypeDescriptor.java,1.1,1.2 Row.java,1.1,1.2 RowDescriptor.java,1.1,1.2 SelectionList.java,1.1,1.2 SelectionListDescriptor.java,1.1,1.2 SessionParameter.java,1.1,1.2 SessionParameterDescriptor.java,1.1,1.2 SessionParameterType.java,1.1,1.2 SessionParameterTypeDescriptor.java,1.1,1.2 Str_length.java,1.1,1.2 Str_lengthDescriptor.java,1.1,1.2 Styling.java,1.1,1.2 StylingDescriptor.java,1.1,1.2 Validate.java,1.1,1.2 ValidateDescriptor.java,1.1,1.2 Value.java,1.1,1.2 ValueDescriptor.java,1.1,1.2 Visible.java,1.1,1.2 VisibleDescriptor.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/java/net/sf/dynxform/form/schema

Modified Files:
	Act.java ActDescriptor.java Action.java ActionDescriptor.java 
	CalculatedValue.java CalculatedValueDescriptor.java Chain.java 
	ChainDescriptor.java ChainItem.java ChainItemDescriptor.java 
	ChainType.java ChainTypeDescriptor.java Column.java 
	ColumnDescriptor.java Concat.java ConcatDescriptor.java 
	ConcatItem.java ConcatItemDescriptor.java ConcatType.java 
	ConcatTypeDescriptor.java CreditCard.java 
	CreditCardDescriptor.java CurrentRow.java 
	CurrentRowDescriptor.java Data_value.java 
	Data_valueDescriptor.java DateValidator.java 
	DateValidatorDescriptor.java Daterange.java 
	DaterangeDescriptor.java Email.java EmailDescriptor.java 
	Enable.java EnableDescriptor.java Field.java 
	FieldDescriptor.java FieldValidator.java 
	FieldValidatorChoice.java FieldValidatorChoiceDescriptor.java 
	FieldValidatorDescriptor.java Form.java FormDescriptor.java 
	ForwardParameter.java ForwardParameterDescriptor.java 
	ForwardParameterType.java ForwardParameterTypeDescriptor.java 
	Grid.java GridBody.java GridBodyDescriptor.java 
	GridColumn.java GridColumnDescriptor.java GridData.java 
	GridDataDescriptor.java GridDataType.java 
	GridDataTypeDescriptor.java GridDefinition.java 
	GridDefinitionDescriptor.java GridDescriptor.java Group.java 
	GroupDescriptor.java Headers.java HeadersDescriptor.java 
	Inrange.java InrangeDescriptor.java Item.java 
	ItemDescriptor.java Layout.java LayoutDescriptor.java 
	Length.java LengthDescriptor.java ListDefinition.java 
	ListDefinitionDescriptor.java ListItem.java 
	ListItemDescriptor.java Mask_value.java 
	Mask_valueDescriptor.java Name.java NameDescriptor.java 
	Output.java OutputDescriptor.java OutputParameter.java 
	OutputParameterDescriptor.java OutputParameterType.java 
	OutputParameterTypeDescriptor.java Parameter.java 
	ParameterDescriptor.java Range.java RangeDescriptor.java 
	Regexp.java RegexpDescriptor.java Regexp_value.java 
	Regexp_valueDescriptor.java Report.java ReportDescriptor.java 
	ReportList.java ReportListDescriptor.java ReportRef.java 
	ReportRefDescriptor.java ReportReferenceType.java 
	ReportReferenceTypeDescriptor.java RequestParameter.java 
	RequestParameterDescriptor.java RequestParameterType.java 
	RequestParameterTypeDescriptor.java ResultSet.java 
	ResultSetDescriptor.java ResultSetType.java 
	ResultSetTypeDescriptor.java Row.java RowDescriptor.java 
	SelectionList.java SelectionListDescriptor.java 
	SessionParameter.java SessionParameterDescriptor.java 
	SessionParameterType.java SessionParameterTypeDescriptor.java 
	Str_length.java Str_lengthDescriptor.java Styling.java 
	StylingDescriptor.java Validate.java ValidateDescriptor.java 
	Value.java ValueDescriptor.java Visible.java 
	VisibleDescriptor.java 
Log Message:
packages refactoring fix

Index: GroupDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GroupDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GroupDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GroupDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.IntegerValidator;
  
  /**

Index: FieldValidatorChoiceDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/FieldValidatorChoiceDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldValidatorChoiceDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- FieldValidatorChoiceDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: Field.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Field.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Field.java	19 Jul 2004 11:55:49 -0000	1.1
--- Field.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,27 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import net.sf.dynxform.form.schema.types.FieldType;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: GridDataTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDataTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridDataTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridDataTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: Column.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Column.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Column.java	19 Jul 2004 11:55:49 -0000	1.1
--- Column.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ParameterDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ParameterDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- ParameterDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,17 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.BooleanValidator;
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: GridBodyDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridBodyDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridBodyDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridBodyDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: Enable.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Enable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Enable.java	19 Jul 2004 11:55:49 -0000	1.1
--- Enable.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: SelectionList.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/SelectionList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionList.java	19 Jul 2004 11:55:50 -0000	1.1
--- SelectionList.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: ForwardParameter.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ForwardParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForwardParameter.java	19 Jul 2004 11:55:49 -0000	1.1
--- ForwardParameter.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: SelectionListDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/SelectionListDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionListDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- SelectionListDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: Action.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Action.java	19 Jul 2004 11:55:49 -0000	1.1
--- Action.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 12,27 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import net.sf.dynxform.form.schema.types.ActionType;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: CreditCardDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/CreditCardDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreditCardDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- CreditCardDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: EnableDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/EnableDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnableDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- EnableDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ActionDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ActionDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActionDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ActionDescriptor.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: Row.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Row.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Row.java	19 Jul 2004 11:55:50 -0000	1.1
--- Row.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: SessionParameterTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/SessionParameterTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionParameterTypeDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- SessionParameterTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: Str_lengthDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Str_lengthDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Str_lengthDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- Str_lengthDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.IntegerValidator;
  
  /**

Index: Act.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Act.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Act.java	19 Jul 2004 11:55:49 -0000	1.1
--- Act.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 12,27 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import net.sf.dynxform.form.schema.types.ActType;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: CalculatedValueDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/CalculatedValueDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CalculatedValueDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- CalculatedValueDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: OutputParameterType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/OutputParameterType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutputParameterType.java	19 Jul 2004 11:55:50 -0000	1.1
--- OutputParameterType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Group.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Group.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Group.java	19 Jul 2004 11:55:49 -0000	1.1
--- Group.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: Visible.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Visible.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Visible.java	19 Jul 2004 11:55:50 -0000	1.1
--- Visible.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: EmailDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/EmailDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EmailDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- EmailDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: LengthDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/LengthDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LengthDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- LengthDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: Item.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Item.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Item.java	19 Jul 2004 11:55:49 -0000	1.1
--- Item.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Headers.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Headers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Headers.java	19 Jul 2004 11:55:49 -0000	1.1
--- Headers.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: Layout.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Layout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Layout.java	19 Jul 2004 11:55:49 -0000	1.1
--- Layout.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: CurrentRowDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/CurrentRowDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CurrentRowDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- CurrentRowDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: ConcatType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ConcatType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcatType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConcatType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: ReportRef.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ReportRef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportRef.java	19 Jul 2004 11:55:50 -0000	1.1
--- ReportRef.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ReportReferenceType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ReportReferenceType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportReferenceType.java	19 Jul 2004 11:55:50 -0000	1.1
--- ReportReferenceType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ReportRefDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ReportRefDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportRefDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- ReportRefDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: FieldValidator.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/FieldValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldValidator.java	19 Jul 2004 11:55:49 -0000	1.1
--- FieldValidator.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ChainTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ChainTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChainTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ChainTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: GridDefinition.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDefinition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridDefinition.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridDefinition.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: ListDefinition.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ListDefinition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ListDefinition.java	19 Jul 2004 11:55:50 -0000	1.1
--- ListDefinition.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: CreditCard.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/CreditCard.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreditCard.java	19 Jul 2004 11:55:49 -0000	1.1
--- CreditCard.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: NameDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/NameDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NameDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- NameDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: ForwardParameterDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ForwardParameterDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForwardParameterDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ForwardParameterDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ForwardParameterTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ForwardParameterTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForwardParameterTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ForwardParameterTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: CurrentRow.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/CurrentRow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CurrentRow.java	19 Jul 2004 11:55:49 -0000	1.1
--- CurrentRow.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: OutputParameterTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/OutputParameterTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutputParameterTypeDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- OutputParameterTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: ConcatItem.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ConcatItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcatItem.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConcatItem.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: GridDataType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDataType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridDataType.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridDataType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Mask_valueDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Mask_valueDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mask_valueDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- Mask_valueDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: Form.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Form.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Form.java	19 Jul 2004 11:55:49 -0000	1.1
--- Form.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: OutputParameter.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/OutputParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutputParameter.java	19 Jul 2004 11:55:50 -0000	1.1
--- OutputParameter.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Mask_value.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Mask_value.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mask_value.java	19 Jul 2004 11:55:50 -0000	1.1
--- Mask_value.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ConcatTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ConcatTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcatTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConcatTypeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: RangeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/RangeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RangeDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- RangeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.DoubleValidator;
  
  /**

Index: ReportList.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ReportList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportList.java	19 Jul 2004 11:55:50 -0000	1.1
--- ReportList.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: ChainType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ChainType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChainType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ChainType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import java.util.ArrayList;
- import java.util.Enumeration;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! import org.exolab.castor.xml.ValidationException;
! import org.xml.sax.ContentHandler;
  
  /**
--- 12,19 ----
  //---------------------------------/
  
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
! 
! import java.util.ArrayList;
  
  /**

Index: Validate.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Validate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Validate.java	19 Jul 2004 11:55:50 -0000	1.1
--- Validate.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Data_valueDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Data_valueDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Data_valueDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- Data_valueDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: GridColumnDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridColumnDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridColumnDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridColumnDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: Name.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Name.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Name.java	19 Jul 2004 11:55:50 -0000	1.1
--- Name.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: InrangeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/InrangeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InrangeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- InrangeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ReportDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ReportDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- ReportDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: ForwardParameterType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ForwardParameterType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForwardParameterType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ForwardParameterType.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: GridDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: ValueDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ValueDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ValueDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- ValueDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: GridDataDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDataDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridDataDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridDataDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: GridColumn.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridColumn.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridColumn.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: FormDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/FormDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FormDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- FormDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! import org.exolab.castor.xml.validators.StringValidator;
  
  /**

Index: Parameter.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Parameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Parameter.java	19 Jul 2004 11:55:50 -0000	1.1
--- Parameter.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: ResultSetDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/ResultSetDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResultSetDescriptor.java	19 Jul 2004 11:55:50 -0000	1.1
--- ResultSetDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: DaterangeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/DaterangeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DaterangeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- DaterangeDescriptor.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: GridData.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridData.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridData.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,24 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: Styling.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/Styling.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Styling.java	19 Jul 2004 11:55:50 -0000	1.1
--- Styling.java	11 Aug 2004 17:32:54 -0000	1.2
***************
*** 12,26 ****
  //---------------------------------/
  
- import java.io.IOException;
- import java.io.Reader;
- import java.io.Serializable;
- import java.io.Writer;
- import net.sf.dynxform.form.schema.types.StylingFieldType;
- import net.sf.dynxform.form.schema.types.StylingListOrintation;
- import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.Marshaller;
  import org.exolab.castor.xml.Unmarshaller;
- import org.exolab.castor.xml.ValidationException;
- import org.xml.sax.ContentHandler;
  
  /**
--- 12,17 ----

Index: GridDefinitionDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/GridDefinitionDescriptor.java,v
retrieving revision 1.1
retrieving re...
 
[truncated message content]

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/form/schema/types ActType.java,1.1,1.2 ActTypeDescriptor.java,1.1,1.2 ActionType.java,1.1,1.2 ActionTypeDescriptor.java,1.1,1.2 FieldType.java,1.1,1.2 FieldTypeDescriptor.java,1.1,1.2 ParameterType.java,1.1,1.2 ParameterTypeDescriptor.java,1.1,1.2 RequestType.java,1.1,1.2 RequestTypeDescriptor.java,1.1,1.2 SessionType.java,1.1,1.2 SessionTypeDescriptor.java,1.1,1.2 StylingFieldType.java,1.1,1.2 StylingFieldTypeDescriptor.java,1.1,1.2 StylingListOrintation.java,1.1,1.2 StylingListOrintationDescriptor.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/java/net/sf/dynxform/form/schema/types

Modified Files:
	ActType.java ActTypeDescriptor.java ActionType.java 
	ActionTypeDescriptor.java FieldType.java 
	FieldTypeDescriptor.java ParameterType.java 
	ParameterTypeDescriptor.java RequestType.java 
	RequestTypeDescriptor.java SessionType.java 
	SessionTypeDescriptor.java StylingFieldType.java 
	StylingFieldTypeDescriptor.java StylingListOrintation.java 
	StylingListOrintationDescriptor.java 
Log Message:
packages refactoring fix

Index: SessionType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/SessionType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionType.java	19 Jul 2004 11:55:49 -0000	1.1
--- SessionType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: FieldTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/FieldTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- FieldTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ParameterTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ParameterTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ParameterTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ActTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ActTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ActTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: SessionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/SessionTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- SessionTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: RequestType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/RequestType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestType.java	19 Jul 2004 11:55:49 -0000	1.1
--- RequestType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: ActionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ActionTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActionTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- ActionTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ParameterType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ParameterType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ParameterType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: StylingFieldTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/StylingFieldTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylingFieldTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- StylingFieldTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: StylingListOrintation.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/StylingListOrintation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylingListOrintation.java	19 Jul 2004 11:55:49 -0000	1.1
--- StylingListOrintation.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: RequestTypeDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/RequestTypeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestTypeDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- RequestTypeDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: ActionType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ActionType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActionType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ActionType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: StylingListOrintationDescriptor.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/StylingListOrintationDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylingListOrintationDescriptor.java	19 Jul 2004 11:55:49 -0000	1.1
--- StylingListOrintationDescriptor.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,19 ****
  //---------------------------------/
  
! import org.exolab.castor.mapping.AccessMode;
! import org.exolab.castor.xml.TypeValidator;
! import org.exolab.castor.xml.XMLFieldDescriptor;
! import org.exolab.castor.xml.validators.*;
  
  /**
--- 12,16 ----
  //---------------------------------/
  
! 
  
  /**

Index: FieldType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/FieldType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldType.java	19 Jul 2004 11:55:49 -0000	1.1
--- FieldType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: StylingFieldType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/StylingFieldType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylingFieldType.java	19 Jul 2004 11:55:49 -0000	1.1
--- StylingFieldType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

Index: ActType.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/schema/types/ActType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActType.java	19 Jul 2004 11:55:49 -0000	1.1
--- ActType.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 12,20 ****
  //---------------------------------/
  
- import java.io.Serializable;
- import java.util.Enumeration;
  import java.util.Hashtable;
- import org.exolab.castor.xml.Marshaller;
- import org.exolab.castor.xml.Unmarshaller;
  
  /**
--- 12,16 ----

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/form/data/consumer ChainConsumer.java,1.1,1.2 ChainValue.java,1.1,1.2 ConcatConsumer.java,1.1,1.2 ConcatValue.java,1.1,1.2 ConstantConsumer.java,1.1,1.2 ConstantValue.java,1.1,1.2 ConsumerFactory.java,1.1,1.2 GridColumnConsumer.java,1.1,1.2 GridColumnValue.java,1.1,1.2 ParameterConsumer.java,1.1,1.2 ParameterValue.java,1.1,1.2 SessionContextConsumer.java,1.1,1.2 SessionContextValue.java,1.1,1.2 SourceConsumer.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/java/net/sf/dynxform/form/data/consumer

Modified Files:
	ChainConsumer.java ChainValue.java ConcatConsumer.java 
	ConcatValue.java ConstantConsumer.java ConstantValue.java 
	ConsumerFactory.java GridColumnConsumer.java 
	GridColumnValue.java ParameterConsumer.java 
	ParameterValue.java SessionContextConsumer.java 
	SessionContextValue.java SourceConsumer.java 
Log Message:
packages refactoring fix

Index: ParameterValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ParameterValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- ParameterValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 2,8 ****
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
- import net.sf.dynxform.form.DataSource;
  
  /**
--- 2,8 ----
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  
  /**

Index: GridColumnConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/GridColumnConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridColumnConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridColumnConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 1,11 ****
  package net.sf.dynxform.form.data.consumer;
  
! import net.sf.dynxform.form.schema.CalculatedValue;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
! import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.types.Report;
- import net.sf.dynxform.exception.business.BusinessException;
  
  /**
--- 1,11 ----
  package net.sf.dynxform.form.data.consumer;
  
! import net.sf.dynxform.exception.business.BusinessException;
! import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
! import net.sf.dynxform.form.schema.CalculatedValue;
  import net.sf.dynxform.form.types.Report;
  
  /**

Index: SourceConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/SourceConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SourceConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- SourceConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 3,9 ****
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
  import net.sf.dynxform.form.data.ModuleInfo;
  import net.sf.dynxform.form.data.module.SourceModule;
- import net.sf.dynxform.form.DataSource;
  
  /**
--- 3,9 ----
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleInfo;
  import net.sf.dynxform.form.data.module.SourceModule;
  
  /**

Index: ConcatConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ConcatConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcatConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConcatConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 8,13 ****
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.schema.CalculatedValue;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  
  import java.util.ArrayList;
--- 8,11 ----

Index: ConsumerFactory.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ConsumerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConsumerFactory.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConsumerFactory.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 1,7 ****
  package net.sf.dynxform.form.data.consumer;
  
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.schema.*;
- import net.sf.dynxform.exception.business.BusinessException;
  
  /**
--- 1,7 ----
  package net.sf.dynxform.form.data.consumer;
  
+ import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.schema.*;
  
  /**

Index: GridColumnValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/GridColumnValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridColumnValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridColumnValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 2,10 ****
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
- import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.types.Report;
  
--- 2,10 ----
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
  import net.sf.dynxform.form.types.Report;
  

Index: SessionContextValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/SessionContextValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionContextValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- SessionContextValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 1,12 ****
  package net.sf.dynxform.form.data.consumer;
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.business.SessionContextException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
- import net.sf.dynxform.container.SessionContext;
  import net.sf.dynxform.form.schema.CalculatedValue;
- import net.sf.dynxform.form.DataSource;
  
  /**
--- 1,12 ----
  package net.sf.dynxform.form.data.consumer;
  
+ import net.sf.dynxform.container.SessionContext;
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.business.SessionContextException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
  
  /**

Index: ConcatValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ConcatValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConcatValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConcatValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 12,18 ****
  import java.util.List;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
  /**
   * net.sf.dynxform.form.data.consumer Apr 8, 2004 2:37:13 PM andreyp
--- 12,15 ----

Index: ChainConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ChainConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChainConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- ChainConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 8,11 ****
--- 8,13 ----
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.schema.CalculatedValue;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  
  import java.util.ArrayList;
***************
*** 13,19 ****
  import java.util.List;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
  /**
   * net.sf.dynxform.form.data.consumer Mar 15, 2004 11:54:30 AM andreyp
--- 15,18 ----

Index: ConstantConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ConstantConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstantConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConstantConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 1,9 ****
  package net.sf.dynxform.form.data.consumer;
  
! import net.sf.dynxform.form.schema.CalculatedValue;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
! import net.sf.dynxform.form.DataSource;
! import net.sf.dynxform.exception.business.BusinessException;
  
  /**
--- 1,9 ----
  package net.sf.dynxform.form.data.consumer;
  
! import net.sf.dynxform.exception.business.BusinessException;
! import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
! import net.sf.dynxform.form.schema.CalculatedValue;
  
  /**

Index: ParameterConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ParameterConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- ParameterConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 2,9 ****
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
- import net.sf.dynxform.form.DataSource;
  
  /**
--- 2,9 ----
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
  
  /**

Index: ConstantValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ConstantValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstantValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- ConstantValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 2,8 ****
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
- import net.sf.dynxform.form.DataSource;
  
  /**
--- 2,8 ----
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.DataSource;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  
  /**

Index: SessionContextConsumer.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/SessionContextConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionContextConsumer.java	19 Jul 2004 11:55:49 -0000	1.1
--- SessionContextConsumer.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 1,12 ****
  package net.sf.dynxform.form.data.consumer;
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.business.SessionContextException;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
- import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.schema.CalculatedValue;
- import net.sf.dynxform.form.DataSource;
- import net.sf.dynxform.container.SessionContext;
  
  /**
--- 1,12 ----
  package net.sf.dynxform.form.data.consumer;
  
+ import net.sf.dynxform.container.SessionContext;
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.business.SessionContextException;
+ import net.sf.dynxform.form.DataSource;
+ import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.data.module.SourceModule;
  import net.sf.dynxform.form.data.module.helpers.ModuleValueHelper;
  import net.sf.dynxform.form.schema.CalculatedValue;
  
  /**

Index: ChainValue.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/consumer/ChainValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChainValue.java	19 Jul 2004 11:55:49 -0000	1.1
--- ChainValue.java	11 Aug 2004 17:32:52 -0000	1.2
***************
*** 7,10 ****
--- 7,12 ----
  import net.sf.dynxform.form.data.manage.ConsumerManager;
  import net.sf.dynxform.form.data.module.SourceModule;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  
  import java.util.ArrayList;
***************
*** 12,18 ****
  import java.util.List;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
  /**
   * net.sf.dynxform.form.data.consumer Apr 8, 2004 2:37:13 PM andreyp
--- 14,17 ----

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/report ReportBuilder.java,1.1,1.2 ReportPool.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/java/net/sf/dynxform/report

Modified Files:
	ReportBuilder.java ReportPool.java 
Log Message:
packages refactoring fix

Index: ReportPool.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/report/ReportPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportPool.java	19 Jul 2004 11:55:51 -0000	1.1
--- ReportPool.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 7,16 ****
  package net.sf.dynxform.report;
  
- import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.container.DefinitionProvider;
  import net.sf.dynxform.report.schema.Report;
  import net.sf.dynxform.util.BasePool;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  
  import java.net.URL;
--- 7,14 ----
  package net.sf.dynxform.report;
  
  import net.sf.dynxform.container.DefinitionProvider;
+ import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.report.schema.Report;
  import net.sf.dynxform.util.BasePool;
  
  import java.net.URL;

Index: ReportBuilder.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/report/ReportBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReportBuilder.java	19 Jul 2004 11:55:51 -0000	1.1
--- ReportBuilder.java	11 Aug 2004 17:32:55 -0000	1.2
***************
*** 1,7 ****
  package net.sf.dynxform.report;
  
  import net.sf.dynxform.database.Query;
  import net.sf.dynxform.database.StoredProcedure;
- import net.sf.dynxform.database.DatabaseConnection;
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
--- 1,7 ----
  package net.sf.dynxform.report;
  
+ import net.sf.dynxform.database.DatabaseConnection;
  import net.sf.dynxform.database.Query;
  import net.sf.dynxform.database.StoredProcedure;
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;

[Dynxform-commits] dynxform/src/java/net/sf/dynxform/form/data/module AbstractModule.java,1.1,1.2 GridModule.java,1.1,1.2 OutputModule.java,1.1,1.2 ParameterModule.java,1.1,1.2 SingleReportModule.java,1.1,1.2 SourceModule.java,1.1,1.2 StateModule.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/java/net/sf/dynxform/form/data/module

Modified Files:
	AbstractModule.java GridModule.java OutputModule.java 
	ParameterModule.java SingleReportModule.java SourceModule.java 
	StateModule.java 
Log Message:
packages refactoring fix

Index: ParameterModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/ParameterModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParameterModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- ParameterModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 2,7 ****
  
  import net.sf.dynxform.exception.business.BusinessException;
- import net.sf.dynxform.form.model.FormDefinition;
  import net.sf.dynxform.form.FormContext;
  
  
--- 2,7 ----
  
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.form.FormContext;
+ import net.sf.dynxform.form.model.FormDefinition;
  
  

Index: OutputModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/OutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutputModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- OutputModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 3,13 ****
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.model.FormDefinition;
- import net.sf.dynxform.form.FormContext;
- 
- import java.util.Map;
  
  import java.util.HashMap;
  
  
--- 3,12 ----
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
+ import net.sf.dynxform.form.FormContext;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.model.FormDefinition;
  
  import java.util.HashMap;
+ import java.util.Map;
  
  

Index: StateModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/StateModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StateModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- StateModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 1,6 ****
  package net.sf.dynxform.form.data.module;
  
- import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.exception.business.BusinessException;
  
  import java.util.HashMap;
--- 1,6 ----
  package net.sf.dynxform.form.data.module;
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.data.ModuleType;
  
  import java.util.HashMap;

Index: AbstractModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/AbstractModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- AbstractModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 3,8 ****
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
- import net.sf.dynxform.form.model.FormDefinition;
  import net.sf.dynxform.form.FormContext;
  
  import java.util.Map;
--- 3,8 ----
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
  import net.sf.dynxform.form.FormContext;
+ import net.sf.dynxform.form.model.FormDefinition;
  
  import java.util.Map;

Index: GridModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/GridModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- GridModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 1,6 ****
  package net.sf.dynxform.form.data.module;
  
- import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.exception.business.BusinessException;
  
  
--- 1,6 ----
  package net.sf.dynxform.form.data.module;
  
  import net.sf.dynxform.exception.business.BusinessException;
+ import net.sf.dynxform.form.data.ModuleType;
  
  

Index: SourceModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/SourceModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SourceModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- SourceModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 3,9 ****
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
  import net.sf.dynxform.form.data.ModuleInfo;
  import net.sf.dynxform.form.model.FormDefinition;
- import net.sf.dynxform.form.FormContext;
  
  import java.util.Map;
--- 3,9 ----
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
+ import net.sf.dynxform.form.FormContext;
  import net.sf.dynxform.form.data.ModuleInfo;
  import net.sf.dynxform.form.model.FormDefinition;
  
  import java.util.Map;

Index: SingleReportModule.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/form/data/module/SingleReportModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SingleReportModule.java	19 Jul 2004 11:55:49 -0000	1.1
--- SingleReportModule.java	11 Aug 2004 17:32:53 -0000	1.2
***************
*** 3,11 ****
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.model.FormDefinition;
  import net.sf.dynxform.form.model.ReportDefinition;
  import net.sf.dynxform.form.types.Report;
- import net.sf.dynxform.form.FormContext;
  import net.sf.dynxform.report.ReportBuilder;
  
--- 3,11 ----
  import net.sf.dynxform.exception.business.BusinessException;
  import net.sf.dynxform.exception.system.SystemException;
+ import net.sf.dynxform.form.FormContext;
  import net.sf.dynxform.form.data.ModuleType;
  import net.sf.dynxform.form.model.FormDefinition;
  import net.sf.dynxform.form.model.ReportDefinition;
  import net.sf.dynxform.form.types.Report;
  import net.sf.dynxform.report.ReportBuilder;