================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/tools/schemaframework/TableSequenceDefinition.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Sep  8 10:57:42 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6	Fri Sep  8 10:36:33 2006
--- /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/tools/schemaframework/TableSequenceDefinition.java	Fri Sep  8 10:57:42 2006
***************
*** 18,24 ****
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2005, Oracle. All rights reserved.  
  package oracle.toplink.essentials.tools.schemaframework;
  
  import java.util.Vector;
--- 18,24 ----
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.tools.schemaframework;
  
  import java.util.Vector;
***************
*** 44,63 ****
  
      /** Hold the name of the column in the sequence table which specifies the sequence numeric value */
      public String sequenceCounterFieldName;
  
!     public TableSequenceDefinition(String name, String sequenceTableName, String sequenceNameFieldName, String sequenceCounterFieldName) {
          super(name);
          setSequenceTableName(sequenceTableName);
          setSequenceCounterFieldName(sequenceCounterFieldName);
          setSequenceNameFieldName(sequenceNameFieldName);
      }
  
      public TableSequenceDefinition(TableSequence sequence) {
!         this(sequence.getName(), sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName());
      }
  
      public TableSequenceDefinition(String name, TableSequence sequence) {
!         this(name, sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName());
      }
  
      /**
--- 44,66 ----
  
      /** Hold the name of the column in the sequence table which specifies the sequence numeric value */
      public String sequenceCounterFieldName;
+     
+     public int initialValue = 0;
  
!     public TableSequenceDefinition(String name, String sequenceTableName, String sequenceNameFieldName, String sequenceCounterFieldName, int initialValue) {
          super(name);
          setSequenceTableName(sequenceTableName);
          setSequenceCounterFieldName(sequenceCounterFieldName);
          setSequenceNameFieldName(sequenceNameFieldName);
+         setInitialValue(initialValue);
      }
  
      public TableSequenceDefinition(TableSequence sequence) {
!         this(sequence.getName(), sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName(), sequence.getInitialValue());
      }
  
      public TableSequenceDefinition(String name, TableSequence sequence) {
!         this(name, sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName(), sequence.getInitialValue());
      }
  
      /**
***************
*** 72,78 ****
              writer.write("(" + getSequenceNameFieldName());
              writer.write(", " + getSequenceCounterFieldName());
              writer.write(") values (");
!             writer.write("'" + getName() + "', 0)");
          } catch (IOException ioException) {
              throw ValidationException.fileError(ioException);
          }
--- 75,81 ----
              writer.write("(" + getSequenceNameFieldName());
              writer.write(", " + getSequenceCounterFieldName());
              writer.write(") values (");
!             writer.write("'" + getName() + "', "  + initialValue + ")");
          } catch (IOException ioException) {
              throw ValidationException.fileError(ioException);
          }
***************
*** 108,113 ****
--- 111,123 ----
      /**
       * PUBLIC:
       */
+     public void setInitialValue(int initialValue) {
+         this.initialValue = initialValue;
+     }
+     
+     /**
+      * PUBLIC:
+      */
      public void setSequenceTableName(String sequenceTableName) {
          this.sequenceTableName = sequenceTableName;
      }
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProject.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8
Report generated at Fri Sep  8 10:57:42 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8	Fri Sep  8 10:36:50 2006
--- /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProject.java	Fri Sep  8 10:57:42 2006
***************
*** 572,578 ****
              for (MetadataTableGenerator tableGenerator : m_tableGenerators.values()) {

                  String tableGeneratorName = tableGenerator.getName();

                  String seqName = (tableGenerator.getPkColumnValue().equals("")) ? tableGeneratorName : tableGenerator.getPkColumnValue();

!                 TableSequence sequence = new TableSequence(seqName, tableGenerator.getAllocationSize());

                  sequences.put(tableGeneratorName, sequence);

                  

                  // Get the database table from the @TableGenerator values.

--- 572,578 ----
              for (MetadataTableGenerator tableGenerator : m_tableGenerators.values()) {

                  String tableGeneratorName = tableGenerator.getName();

                  String seqName = (tableGenerator.getPkColumnValue().equals("")) ? tableGeneratorName : tableGenerator.getPkColumnValue();

!                 TableSequence sequence = new TableSequence(seqName, tableGenerator.getAllocationSize(), tableGenerator.getInitialValue());

                  sequences.put(tableGeneratorName, sequence);

                  

                  // Get the database table from the @TableGenerator values.

================================================================================
Merge Diffs: /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Employee.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.18
Report generated at Fri Sep  8 10:57:42 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.18	Fri Sep  8 10:39:18 2006
--- /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Employee.java	Fri Sep  8 10:57:42 2006
***************
*** 116,122 ****
          table="CMP3_EMPLOYEE_SEQ", 
          pkColumnName="SEQ_NAME", 
          valueColumnName="SEQ_COUNT",
!         pkColumnValue="EMPLOYEE_SEQ"
      )
      @Column(name="EMP_ID")
  	public Integer getId() { 
--- 116,123 ----
          table="CMP3_EMPLOYEE_SEQ", 
          pkColumnName="SEQ_NAME", 
          valueColumnName="SEQ_COUNT",
!         pkColumnValue="EMPLOYEE_SEQ",
!         initialValue=50
      )
      @Column(name="EMP_ID")
  	public Integer getId() { 
================================================================================
Merge Diffs: /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.48
Report generated at Fri Sep  8 10:57:42 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.48	Fri Sep  8 10:39:31 2006
--- /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Sep  8 10:57:42 2006
***************
*** 61,66 ****
--- 61,67 ----
  import oracle.toplink.essentials.internal.ejb.cmp3.EJBQueryImpl;
  import oracle.toplink.essentials.internal.helper.Helper;
  import oracle.toplink.essentials.queryframework.ObjectLevelReadQuery;
+ import oracle.toplink.essentials.tools.schemaframework.SchemaManager;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
***************
*** 68,73 ****
--- 69,75 ----
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Address;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Department;
  import oracle.toplink.essentials.ejb.cmp3.persistence.SEPersistenceUnitInfo;
+ 
  import java.util.Iterator;
  
  import oracle.toplink.essentials.testing.models.cmp3.advanced.LargeProject;
***************
*** 95,101 ****
  
          return new TestSetup(suite) {
              protected void setUp(){
!                 new AdvancedTableCreator().replaceTables(JUnitTestCase.getServerSession());
              }
  
              protected void tearDown() {
--- 97,104 ----
  
          return new TestSetup(suite) {
              protected void setUp(){
!                 SchemaManager schemaManager = new SchemaManager(JUnitTestCase.getServerSession());
!                 new AdvancedTableCreator().replaceTables(JUnitTestCase.getServerSession(), schemaManager);
              }
  
              protected void tearDown() {
***************
*** 2441,2447 ****
          }
      }
      
-     
      public static void main(String[] args) {
          // Now run JUnit.
          junit.swingui.TestRunner.main(args);
--- 2444,2449 ----
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/tools/schemaframework/TableSequenceDefinition.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6
Report generated at Fri Sep  8 10:58:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6	Fri Sep  8 10:36:33 2006
--- /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/tools/schemaframework/TableSequenceDefinition.java	Fri Sep  8 10:57:42 2006
***************
*** 18,24 ****
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2005, Oracle. All rights reserved.  
  package oracle.toplink.essentials.tools.schemaframework;
  
  import java.util.Vector;
--- 18,24 ----
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.tools.schemaframework;
  
  import java.util.Vector;
***************
*** 44,63 ****
  
      /** Hold the name of the column in the sequence table which specifies the sequence numeric value */
      public String sequenceCounterFieldName;
  
!     public TableSequenceDefinition(String name, String sequenceTableName, String sequenceNameFieldName, String sequenceCounterFieldName) {
          super(name);
          setSequenceTableName(sequenceTableName);
          setSequenceCounterFieldName(sequenceCounterFieldName);
          setSequenceNameFieldName(sequenceNameFieldName);
      }
  
      public TableSequenceDefinition(TableSequence sequence) {
!         this(sequence.getName(), sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName());
      }
  
      public TableSequenceDefinition(String name, TableSequence sequence) {
!         this(name, sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName());
      }
  
      /**
--- 44,66 ----
  
      /** Hold the name of the column in the sequence table which specifies the sequence numeric value */
      public String sequenceCounterFieldName;
+     
+     public int initialValue = 0;
  
!     public TableSequenceDefinition(String name, String sequenceTableName, String sequenceNameFieldName, String sequenceCounterFieldName, int initialValue) {
          super(name);
          setSequenceTableName(sequenceTableName);
          setSequenceCounterFieldName(sequenceCounterFieldName);
          setSequenceNameFieldName(sequenceNameFieldName);
+         setInitialValue(initialValue);
      }
  
      public TableSequenceDefinition(TableSequence sequence) {
!         this(sequence.getName(), sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName(), sequence.getInitialValue());
      }
  
      public TableSequenceDefinition(String name, TableSequence sequence) {
!         this(name, sequence.getTableName(), sequence.getNameFieldName(), sequence.getCounterFieldName(), sequence.getInitialValue());
      }
  
      /**
***************
*** 72,78 ****
              writer.write("(" + getSequenceNameFieldName());
              writer.write(", " + getSequenceCounterFieldName());
              writer.write(") values (");
!             writer.write("'" + getName() + "', 0)");
          } catch (IOException ioException) {
              throw ValidationException.fileError(ioException);
          }
--- 75,81 ----
              writer.write("(" + getSequenceNameFieldName());
              writer.write(", " + getSequenceCounterFieldName());
              writer.write(") values (");
!             writer.write("'" + getName() + "', "  + initialValue + ")");
          } catch (IOException ioException) {
              throw ValidationException.fileError(ioException);
          }
***************
*** 108,113 ****
--- 111,123 ----
      /**
       * PUBLIC:
       */
+     public void setInitialValue(int initialValue) {
+         this.initialValue = initialValue;
+     }
+     
+     /**
+      * PUBLIC:
+      */
      public void setSequenceTableName(String sequenceTableName) {
          this.sequenceTableName = sequenceTableName;
      }
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProject.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8
Report generated at Fri Sep  8 10:58:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8	Fri Sep  8 10:36:50 2006
--- /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProject.java	Fri Sep  8 10:57:42 2006
***************
*** 572,578 ****
              for (MetadataTableGenerator tableGenerator : m_tableGenerators.values()) {

                  String tableGeneratorName = tableGenerator.getName();

                  String seqName = (tableGenerator.getPkColumnValue().equals("")) ? tableGeneratorName : tableGenerator.getPkColumnValue();

!                 TableSequence sequence = new TableSequence(seqName, tableGenerator.getAllocationSize());

                  sequences.put(tableGeneratorName, sequence);

                  

                  // Get the database table from the @TableGenerator values.

--- 572,578 ----
              for (MetadataTableGenerator tableGenerator : m_tableGenerators.values()) {

                  String tableGeneratorName = tableGenerator.getName();

                  String seqName = (tableGenerator.getPkColumnValue().equals("")) ? tableGeneratorName : tableGenerator.getPkColumnValue();

!                 TableSequence sequence = new TableSequence(seqName, tableGenerator.getAllocationSize(), tableGenerator.getInitialValue());

                  sequences.put(tableGeneratorName, sequence);

                  

                  // Get the database table from the @TableGenerator values.

================================================================================
Merge Diffs: /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Employee.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.18
Report generated at Fri Sep  8 10:58:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.18	Fri Sep  8 10:39:18 2006
--- /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Employee.java	Fri Sep  8 10:57:42 2006
***************
*** 116,122 ****
          table="CMP3_EMPLOYEE_SEQ", 
          pkColumnName="SEQ_NAME", 
          valueColumnName="SEQ_COUNT",
!         pkColumnValue="EMPLOYEE_SEQ"
      )
      @Column(name="EMP_ID")
  	public Integer getId() { 
--- 116,123 ----
          table="CMP3_EMPLOYEE_SEQ", 
          pkColumnName="SEQ_NAME", 
          valueColumnName="SEQ_COUNT",
!         pkColumnValue="EMPLOYEE_SEQ",
!         initialValue=50
      )
      @Column(name="EMP_ID")
  	public Integer getId() { 
================================================================================
Merge Diffs: /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.48
Report generated at Fri Sep  8 10:58:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf1119_initial_value_and_derby_tests_060908/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.48	Fri Sep  8 10:39:31 2006
--- /ade/tware_toplink10i/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Sep  8 10:57:42 2006
***************
*** 61,66 ****
--- 61,67 ----
  import oracle.toplink.essentials.internal.ejb.cmp3.EJBQueryImpl;
  import oracle.toplink.essentials.internal.helper.Helper;
  import oracle.toplink.essentials.queryframework.ObjectLevelReadQuery;
+ import oracle.toplink.essentials.tools.schemaframework.SchemaManager;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
***************
*** 68,73 ****
--- 69,75 ----
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Address;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Department;
  import oracle.toplink.essentials.ejb.cmp3.persistence.SEPersistenceUnitInfo;
+ 
  import java.util.Iterator;
  
  import oracle.toplink.essentials.testing.models.cmp3.advanced.LargeProject;
***************
*** 95,101 ****
  
          return new TestSetup(suite) {
              protected void setUp(){
!                 new AdvancedTableCreator().replaceTables(JUnitTestCase.getServerSession());
              }
  
              protected void tearDown() {
--- 97,104 ----
  
          return new TestSetup(suite) {
              protected void setUp(){
!                 SchemaManager schemaManager = new SchemaManager(JUnitTestCase.getServerSession());
!                 new AdvancedTableCreator().replaceTables(JUnitTestCase.getServerSession(), schemaManager);
              }
  
              protected void tearDown() {
***************
*** 2441,2447 ****
          }
      }
      
-     
      public static void main(String[] args) {
          // Now run JUnit.
          junit.swingui.TestRunner.main(args);
--- 2444,2449 ----