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] |