tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwilli...@apache.org
Subject svn commit: r375688 [1/6] - in /incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config: ./ impl/ wrapper/
Date Tue, 07 Feb 2006 20:39:54 GMT
Author: kwilliams
Date: Tue Feb  7 12:39:51 2006
New Revision: 375688

URL: http://svn.apache.org/viewcvs?rev=375688&view=rev
Log:
Re-host of DAS config from EMF to SDO2

Removed:
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigPackage.java
Modified:
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Relationship.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ResultDescriptor.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Table.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ColumnImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/CommandImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigFactoryImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigPackageImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConnectionPropertiesImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/KeyPairImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ParameterImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/RelationshipImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ResultDescriptorImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/TableImpl.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java Tue Feb  7 12:39:51 2006
@@ -1,22 +1,11 @@
 /**
-*
-*  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,230 +15,292 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getPropertyName <em>Property Name</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getColumnType <em>Column Type</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getConverterClassName <em>Converter Class Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getPropertyName <em>Property Name</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Column#getTable <em>Table</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn()
- * @model
  * @generated
  */
-public interface Column extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Name</em>' attribute.
-	 * @see #setPropertyName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_PropertyName()
-	 * @model
-	 * @generated
-	 */
-	String getPropertyName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getPropertyName <em>Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Name</em>' attribute.
-	 * @see #getPropertyName()
-	 * @generated
-	 */
-	void setPropertyName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Converter Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converter Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Converter Class Name</em>' attribute.
-	 * @see #setConverterClassName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_ConverterClassName()
-	 * @model
-	 * @generated
-	 */
-	String getConverterClassName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getConverterClassName <em>Converter Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter Class Name</em>' attribute.
-	 * @see #getConverterClassName()
-	 * @generated
-	 */
-	void setConverterClassName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Primary Key</em>' attribute.
-	 * @see #setPrimaryKey(boolean)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_PrimaryKey()
-	 * @model
-	 * @generated
-	 */
-	boolean isPrimaryKey();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' attribute.
-	 * @see #isPrimaryKey()
-	 * @generated
-	 */
-	void setPrimaryKey(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generated</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Generated</em>' attribute.
-	 * @see #setGenerated(boolean)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_Generated()
-	 * @model
-	 * @generated
-	 */
-	boolean isGenerated();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generated</em>' attribute.
-	 * @see #isGenerated()
-	 * @generated
-	 */
-	void setGenerated(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Collision</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Collision</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Collision</em>' attribute.
-	 * @see #setCollision(boolean)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_Collision()
-	 * @model
-	 * @generated
-	 */
-	boolean isCollision();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Collision</em>' attribute.
-	 * @see #isCollision()
-	 * @generated
-	 */
-	void setCollision(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Table#getColumn <em>Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' container reference.
-	 * @see #setTable(Table)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getColumn_Table()
-	 * @see org.apache.tuscany.das.rdb.config.Table#getColumn
-	 * @model opposite="Column"
-	 * @generated
-	 */
-	Table getTable();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getTable <em>Table</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' container reference.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(Table value);
+public interface Column
+{
+  /**
+   * Returns the value of the '<em><b>Collision</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Collision</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Collision</em>' attribute.
+   * @see #isSetCollision()
+   * @see #unsetCollision()
+   * @see #setCollision(boolean)
+   * @generated
+   */
+  boolean isCollision();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Collision</em>' attribute.
+   * @see #isSetCollision()
+   * @see #unsetCollision()
+   * @see #isCollision()
+   * @generated
+   */
+  void setCollision(boolean value);
+
+  /**
+   * Unsets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetCollision()
+   * @see #isCollision()
+   * @see #setCollision(boolean)
+   * @generated
+   */
+  void unsetCollision();
+
+  /**
+   * Returns whether the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Collision</em>' attribute is set.
+   * @see #unsetCollision()
+   * @see #isCollision()
+   * @see #setCollision(boolean)
+   * @generated
+   */
+  boolean isSetCollision();
+
+  /**
+   * Returns the value of the '<em><b>Column Type</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Column Type</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Column Type</em>' attribute.
+   * @see #setColumnType(String)
+   * @generated
+   */
+  String getColumnType();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getColumnType <em>Column Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Column Type</em>' attribute.
+   * @see #getColumnType()
+   * @generated
+   */
+  void setColumnType(String value);
+
+  /**
+   * Returns the value of the '<em><b>Converter Class Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Converter Class Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Converter Class Name</em>' attribute.
+   * @see #setConverterClassName(String)
+   * @generated
+   */
+  String getConverterClassName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getConverterClassName <em>Converter Class Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Converter Class Name</em>' attribute.
+   * @see #getConverterClassName()
+   * @generated
+   */
+  void setConverterClassName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Generated</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Generated</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Generated</em>' attribute.
+   * @see #isSetGenerated()
+   * @see #unsetGenerated()
+   * @see #setGenerated(boolean)
+   * @generated
+   */
+  boolean isGenerated();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Generated</em>' attribute.
+   * @see #isSetGenerated()
+   * @see #unsetGenerated()
+   * @see #isGenerated()
+   * @generated
+   */
+  void setGenerated(boolean value);
+
+  /**
+   * Unsets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetGenerated()
+   * @see #isGenerated()
+   * @see #setGenerated(boolean)
+   * @generated
+   */
+  void unsetGenerated();
+
+  /**
+   * Returns whether the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Generated</em>' attribute is set.
+   * @see #unsetGenerated()
+   * @see #isGenerated()
+   * @see #setGenerated(boolean)
+   * @generated
+   */
+  boolean isSetGenerated();
+
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Primary Key</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Primary Key</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Primary Key</em>' attribute.
+   * @see #isSetPrimaryKey()
+   * @see #unsetPrimaryKey()
+   * @see #setPrimaryKey(boolean)
+   * @generated
+   */
+  boolean isPrimaryKey();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Primary Key</em>' attribute.
+   * @see #isSetPrimaryKey()
+   * @see #unsetPrimaryKey()
+   * @see #isPrimaryKey()
+   * @generated
+   */
+  void setPrimaryKey(boolean value);
+
+  /**
+   * Unsets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetPrimaryKey()
+   * @see #isPrimaryKey()
+   * @see #setPrimaryKey(boolean)
+   * @generated
+   */
+  void unsetPrimaryKey();
+
+  /**
+   * Returns whether the value of the '{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Primary Key</em>' attribute is set.
+   * @see #unsetPrimaryKey()
+   * @see #isPrimaryKey()
+   * @see #setPrimaryKey(boolean)
+   * @generated
+   */
+  boolean isSetPrimaryKey();
+
+  /**
+   * Returns the value of the '<em><b>Property Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Property Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Property Name</em>' attribute.
+   * @see #setPropertyName(String)
+   * @generated
+   */
+  String getPropertyName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getPropertyName <em>Property Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Property Name</em>' attribute.
+   * @see #getPropertyName()
+   * @generated
+   */
+  void setPropertyName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Table</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Table</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Table</em>' attribute.
+   * @see #setTable(String)
+   * @generated
+   */
+  String getTable();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Column#getTable <em>Table</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Table</em>' attribute.
+   * @see #getTable()
+   * @generated
+   */
+  void setTable(String value);
 
-} 
\ No newline at end of file
+} // Column

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java Tue Feb  7 12:39:51 2006
@@ -6,9 +6,7 @@
  */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -18,160 +16,141 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getSQL <em>SQL</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getKind <em>Kind</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getParameter <em>Parameter</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getResultDescriptor <em>Result Descriptor</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Command#getSQL <em>SQL</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand()
- * @model
  * @generated
  */
-public interface Command extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>SQL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>SQL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>SQL</em>' attribute.
-	 * @see #setSQL(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_SQL()
-	 * @model
-	 * @generated
-	 */
-	String getSQL();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getSQL <em>SQL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>SQL</em>' attribute.
-	 * @see #getSQL()
-	 * @generated
-	 */
-	void setSQL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Kind</em>' attribute.
-	 * @see #setKind(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_Kind()
-	 * @model
-	 * @generated
-	 */
-	String getKind();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getKind <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Config#getCommand <em>Command</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config</em>' container reference.
-	 * @see #setConfig(Config)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_Config()
-	 * @see org.apache.tuscany.das.rdb.config.Config#getCommand
-	 * @model opposite="Command"
-	 * @generated
-	 */
-	Config getConfig();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Config</em>' container reference.
-	 * @see #getConfig()
-	 * @generated
-	 */
-	void setConfig(Config value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter</b></em>' containment reference list.
-	 * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Parameter}.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Parameter#getCommand <em>Command</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter</em>' containment reference list.
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_Parameter()
-	 * @see org.apache.tuscany.das.rdb.config.Parameter#getCommand
-	 * @model type="org.apache.tuscany.das.rdb.config.Parameter" opposite="Command" containment="true"
-	 * @generated
-	 */
-	EList getParameter();
-
-	/**
-	 * Returns the value of the '<em><b>Result Descriptor</b></em>' containment reference list.
-	 * The list contents are of type {@link org.apache.tuscany.das.rdb.config.ResultDescriptor}.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getCommand <em>Command</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Result Descriptor</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Result Descriptor</em>' containment reference list.
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getCommand_ResultDescriptor()
-	 * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getCommand
-	 * @model type="org.apache.tuscany.das.rdb.config.ResultDescriptor" opposite="Command" containment="true"
-	 * @generated
-	 */
-	EList getResultDescriptor();
+public interface Command
+{
+  /**
+   * Returns the value of the '<em><b>Parameter</b></em>' containment reference list.
+   * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Parameter}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Parameter</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Parameter</em>' containment reference list.
+   * @generated
+   */
+  List getParameter();
+
+  /**
+   * Returns the value of the '<em><b>Result Descriptor</b></em>' containment reference list.
+   * The list contents are of type {@link org.apache.tuscany.das.rdb.config.ResultDescriptor}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Result Descriptor</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Result Descriptor</em>' containment reference list.
+   * @generated
+   */
+  List getResultDescriptor();
+
+  /**
+   * Returns the value of the '<em><b>Config</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Config</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Config</em>' attribute.
+   * @see #setConfig(String)
+   * @generated
+   */
+  String getConfig();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Config</em>' attribute.
+   * @see #getConfig()
+   * @generated
+   */
+  void setConfig(String value);
+
+  /**
+   * Returns the value of the '<em><b>Kind</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Kind</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Kind</em>' attribute.
+   * @see #setKind(String)
+   * @generated
+   */
+  String getKind();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getKind <em>Kind</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Kind</em>' attribute.
+   * @see #getKind()
+   * @generated
+   */
+  void setKind(String value);
+
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>SQL</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>SQL</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>SQL</em>' attribute.
+   * @see #setSQL(String)
+   * @generated
+   */
+  String getSQL();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Command#getSQL <em>SQL</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>SQL</em>' attribute.
+   * @see #getSQL()
+   * @generated
+   */
+  void setSQL(String value);
 
 } // Command

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java Tue Feb  7 12:39:51 2006
@@ -6,9 +6,7 @@
  */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -18,125 +16,106 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getUri <em>Uri</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getCommand <em>Command</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getConnectionProperties <em>Connection Properties</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getTable <em>Table</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getRelationship <em>Relationship</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Config#getUri <em>Uri</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig()
- * @model
  * @generated
  */
-public interface Config extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Uri</em>' attribute.
-	 * @see #setUri(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig_Uri()
-	 * @model
-	 * @generated
-	 */
-	String getUri();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Config#getUri <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uri</em>' attribute.
-	 * @see #getUri()
-	 * @generated
-	 */
-	void setUri(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Command</b></em>' containment reference list.
-	 * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Command}.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Command</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Command</em>' containment reference list.
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig_Command()
-	 * @see org.apache.tuscany.das.rdb.config.Command#getConfig
-	 * @model type="org.apache.tuscany.das.rdb.config.Command" opposite="Config" containment="true"
-	 * @generated
-	 */
-	EList getCommand();
-
-	/**
-	 * Returns the value of the '<em><b>Connection Properties</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Properties</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connection Properties</em>' containment reference.
-	 * @see #setConnectionProperties(ConnectionProperties)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig_ConnectionProperties()
-	 * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig
-	 * @model opposite="Config" containment="true"
-	 * @generated
-	 */
-	ConnectionProperties getConnectionProperties();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Config#getConnectionProperties <em>Connection Properties</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Properties</em>' containment reference.
-	 * @see #getConnectionProperties()
-	 * @generated
-	 */
-	void setConnectionProperties(ConnectionProperties value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' containment reference list.
-	 * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Table}.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Table#getConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' containment reference list.
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig_Table()
-	 * @see org.apache.tuscany.das.rdb.config.Table#getConfig
-	 * @model type="org.apache.tuscany.das.rdb.config.Table" opposite="Config" containment="true"
-	 * @generated
-	 */
-	EList getTable();
-
-	/**
-	 * Returns the value of the '<em><b>Relationship</b></em>' containment reference list.
-	 * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Relationship}.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Relationship#getConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relationship</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relationship</em>' containment reference list.
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConfig_Relationship()
-	 * @see org.apache.tuscany.das.rdb.config.Relationship#getConfig
-	 * @model type="org.apache.tuscany.das.rdb.config.Relationship" opposite="Config" containment="true"
-	 * @generated
-	 */
-	EList getRelationship();
+public interface Config
+{
+  /**
+   * Returns the value of the '<em><b>Command</b></em>' containment reference list.
+   * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Command}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Command</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Command</em>' containment reference list.
+   * @generated
+   */
+  List getCommand();
+
+  /**
+   * Returns the value of the '<em><b>Connection Properties</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Connection Properties</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Connection Properties</em>' containment reference.
+   * @see #setConnectionProperties(ConnectionProperties)
+   * @generated
+   */
+  ConnectionProperties getConnectionProperties();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Config#getConnectionProperties <em>Connection Properties</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Connection Properties</em>' containment reference.
+   * @see #getConnectionProperties()
+   * @generated
+   */
+  void setConnectionProperties(ConnectionProperties value);
+
+  /**
+   * Returns the value of the '<em><b>Table</b></em>' containment reference list.
+   * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Table}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Table</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Table</em>' containment reference list.
+   * @generated
+   */
+  List getTable();
+
+  /**
+   * Returns the value of the '<em><b>Relationship</b></em>' containment reference list.
+   * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Relationship}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Relationship</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Relationship</em>' containment reference list.
+   * @generated
+   */
+  List getRelationship();
+
+  /**
+   * Returns the value of the '<em><b>Uri</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Uri</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Uri</em>' attribute.
+   * @see #setUri(String)
+   * @generated
+   */
+  String getUri();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Config#getUri <em>Uri</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Uri</em>' attribute.
+   * @see #getUri()
+   * @generated
+   */
+  void setUri(String value);
 
 } // Config

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java Tue Feb  7 12:39:51 2006
@@ -6,113 +6,103 @@
  */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.ecore.EFactory;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage
  * @generated
  */
-public interface ConfigFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ConfigFactory eINSTANCE = new org.apache.tuscany.das.rdb.config.impl.ConfigFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Config</em>'.
-	 * @generated
-	 */
-	Config createConfig();
-
-	/**
-	 * Returns a new object of class '<em>Command</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Command</em>'.
-	 * @generated
-	 */
-	Command createCommand();
-
-	/**
-	 * Returns a new object of class '<em>Connection Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Connection Properties</em>'.
-	 * @generated
-	 */
-	ConnectionProperties createConnectionProperties();
-
-	/**
-	 * Returns a new object of class '<em>Parameter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Parameter</em>'.
-	 * @generated
-	 */
-	Parameter createParameter();
-
-	/**
-	 * Returns a new object of class '<em>Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Relationship</em>'.
-	 * @generated
-	 */
-	Relationship createRelationship();
-
-	/**
-	 * Returns a new object of class '<em>Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Table</em>'.
-	 * @generated
-	 */
-	Table createTable();
-
-	/**
-	 * Returns a new object of class '<em>Key Pair</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Key Pair</em>'.
-	 * @generated
-	 */
-	KeyPair createKeyPair();
-
-	/**
-	 * Returns a new object of class '<em>Column</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Column</em>'.
-	 * @generated
-	 */
-	Column createColumn();
-
-	/**
-	 * Returns a new object of class '<em>Result Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Result Descriptor</em>'.
-	 * @generated
-	 */
-	ResultDescriptor createResultDescriptor();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ConfigPackage getConfigPackage();
+public interface ConfigFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  ConfigFactory INSTANCE = org.apache.tuscany.das.rdb.config.impl.ConfigFactoryImpl.eINSTANCE;
+
+  /**
+   * Returns a new object of class '<em>Column</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Column</em>'.
+   * @generated
+   */
+  Column createColumn();
+
+  /**
+   * Returns a new object of class '<em>Command</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Command</em>'.
+   * @generated
+   */
+  Command createCommand();
+
+  /**
+   * Returns a new object of class '<em>Config</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Config</em>'.
+   * @generated
+   */
+  Config createConfig();
+
+  /**
+   * Returns a new object of class '<em>Connection Properties</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Connection Properties</em>'.
+   * @generated
+   */
+  ConnectionProperties createConnectionProperties();
+
+  /**
+   * Returns a new object of class '<em>Key Pair</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Key Pair</em>'.
+   * @generated
+   */
+  KeyPair createKeyPair();
+
+  /**
+   * Returns a new object of class '<em>Parameter</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Parameter</em>'.
+   * @generated
+   */
+  Parameter createParameter();
+
+  /**
+   * Returns a new object of class '<em>Relationship</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Relationship</em>'.
+   * @generated
+   */
+  Relationship createRelationship();
+
+  /**
+   * Returns a new object of class '<em>Result Descriptor</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Result Descriptor</em>'.
+   * @generated
+   */
+  ResultDescriptor createResultDescriptor();
+
+  /**
+   * Returns a new object of class '<em>Table</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Table</em>'.
+   * @generated
+   */
+  Table createTable();
 
 } //ConfigFactory

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java Tue Feb  7 12:39:51 2006
@@ -1,22 +1,11 @@
 /**
-*
-*  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,176 +15,161 @@
  * <p>
  * The following features are supported:
  * <ul>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDataSource <em>Data Source</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverClassName <em>Driver Class Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL <em>Driver URL</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverPassword <em>Driver Password</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL <em>Driver URL</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverUserName <em>Driver User Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties()
- * @model
  * @generated
  */
-public interface ConnectionProperties extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Data Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data Source</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Data Source</em>' attribute.
-	 * @see #setDataSource(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_DataSource()
-	 * @model
-	 * @generated
-	 */
-	String getDataSource();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDataSource <em>Data Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Source</em>' attribute.
-	 * @see #getDataSource()
-	 * @generated
-	 */
-	void setDataSource(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Driver Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Driver Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Driver Class Name</em>' attribute.
-	 * @see #setDriverClassName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_DriverClassName()
-	 * @model
-	 * @generated
-	 */
-	String getDriverClassName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverClassName <em>Driver Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Driver Class Name</em>' attribute.
-	 * @see #getDriverClassName()
-	 * @generated
-	 */
-	void setDriverClassName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Driver URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Driver URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Driver URL</em>' attribute.
-	 * @see #setDriverURL(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_DriverURL()
-	 * @model
-	 * @generated
-	 */
-	String getDriverURL();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL <em>Driver URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Driver URL</em>' attribute.
-	 * @see #getDriverURL()
-	 * @generated
-	 */
-	void setDriverURL(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Driver Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Driver Password</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Driver Password</em>' attribute.
-	 * @see #setDriverPassword(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_DriverPassword()
-	 * @model
-	 * @generated
-	 */
-	String getDriverPassword();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverPassword <em>Driver Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Driver Password</em>' attribute.
-	 * @see #getDriverPassword()
-	 * @generated
-	 */
-	void setDriverPassword(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Driver User Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Driver User Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Driver User Name</em>' attribute.
-	 * @see #setDriverUserName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_DriverUserName()
-	 * @model
-	 * @generated
-	 */
-	String getDriverUserName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverUserName <em>Driver User Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Driver User Name</em>' attribute.
-	 * @see #getDriverUserName()
-	 * @generated
-	 */
-	void setDriverUserName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Config#getConnectionProperties <em>Connection Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config</em>' container reference.
-	 * @see #setConfig(Config)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getConnectionProperties_Config()
-	 * @see org.apache.tuscany.das.rdb.config.Config#getConnectionProperties
-	 * @model opposite="ConnectionProperties"
-	 * @generated
-	 */
-	Config getConfig();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Config</em>' container reference.
-	 * @see #getConfig()
-	 * @generated
-	 */
-	void setConfig(Config value);
+public interface ConnectionProperties
+{
+  /**
+   * Returns the value of the '<em><b>Config</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Config</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Config</em>' attribute.
+   * @see #setConfig(String)
+   * @generated
+   */
+  String getConfig();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Config</em>' attribute.
+   * @see #getConfig()
+   * @generated
+   */
+  void setConfig(String value);
+
+  /**
+   * Returns the value of the '<em><b>Data Source</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Data Source</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Data Source</em>' attribute.
+   * @see #setDataSource(String)
+   * @generated
+   */
+  String getDataSource();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDataSource <em>Data Source</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Data Source</em>' attribute.
+   * @see #getDataSource()
+   * @generated
+   */
+  void setDataSource(String value);
+
+  /**
+   * Returns the value of the '<em><b>Driver Class Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Driver Class Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Driver Class Name</em>' attribute.
+   * @see #setDriverClassName(String)
+   * @generated
+   */
+  String getDriverClassName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverClassName <em>Driver Class Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Driver Class Name</em>' attribute.
+   * @see #getDriverClassName()
+   * @generated
+   */
+  void setDriverClassName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Driver Password</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Driver Password</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Driver Password</em>' attribute.
+   * @see #setDriverPassword(String)
+   * @generated
+   */
+  String getDriverPassword();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverPassword <em>Driver Password</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Driver Password</em>' attribute.
+   * @see #getDriverPassword()
+   * @generated
+   */
+  void setDriverPassword(String value);
+
+  /**
+   * Returns the value of the '<em><b>Driver URL</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Driver URL</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Driver URL</em>' attribute.
+   * @see #setDriverURL(String)
+   * @generated
+   */
+  String getDriverURL();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL <em>Driver URL</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Driver URL</em>' attribute.
+   * @see #getDriverURL()
+   * @generated
+   */
+  void setDriverURL(String value);
+
+  /**
+   * Returns the value of the '<em><b>Driver User Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Driver User Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Driver User Name</em>' attribute.
+   * @see #setDriverUserName(String)
+   * @generated
+   */
+  String getDriverUserName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverUserName <em>Driver User Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Driver User Name</em>' attribute.
+   * @see #getDriverUserName()
+   * @generated
+   */
+  void setDriverUserName(String value);
 
 } // ConnectionProperties

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java Tue Feb  7 12:39:51 2006
@@ -1,22 +1,11 @@
 /**
-*
-*  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,95 +15,86 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn <em>Primary Key Column</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.KeyPair#getForeignKeyColumn <em>Foreign Key Column</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn <em>Primary Key Column</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.KeyPair#getRelationship <em>Relationship</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getKeyPair()
- * @model
  * @generated
  */
-public interface KeyPair extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Primary Key Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Primary Key Column</em>' attribute.
-	 * @see #setPrimaryKeyColumn(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getKeyPair_PrimaryKeyColumn()
-	 * @model
-	 * @generated
-	 */
-	String getPrimaryKeyColumn();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn <em>Primary Key Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key Column</em>' attribute.
-	 * @see #getPrimaryKeyColumn()
-	 * @generated
-	 */
-	void setPrimaryKeyColumn(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Foreign Key Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Foreign Key Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Foreign Key Column</em>' attribute.
-	 * @see #setForeignKeyColumn(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getKeyPair_ForeignKeyColumn()
-	 * @model
-	 * @generated
-	 */
-	String getForeignKeyColumn();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getForeignKeyColumn <em>Foreign Key Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Foreign Key Column</em>' attribute.
-	 * @see #getForeignKeyColumn()
-	 * @generated
-	 */
-	void setForeignKeyColumn(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Relationship</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Relationship#getKeyPair <em>Key Pair</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relationship</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relationship</em>' container reference.
-	 * @see #setRelationship(Relationship)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getKeyPair_Relationship()
-	 * @see org.apache.tuscany.das.rdb.config.Relationship#getKeyPair
-	 * @model opposite="KeyPair"
-	 * @generated
-	 */
-	Relationship getRelationship();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getRelationship <em>Relationship</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relationship</em>' container reference.
-	 * @see #getRelationship()
-	 * @generated
-	 */
-	void setRelationship(Relationship value);
+public interface KeyPair
+{
+  /**
+   * Returns the value of the '<em><b>Foreign Key Column</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Foreign Key Column</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Foreign Key Column</em>' attribute.
+   * @see #setForeignKeyColumn(String)
+   * @generated
+   */
+  String getForeignKeyColumn();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getForeignKeyColumn <em>Foreign Key Column</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Foreign Key Column</em>' attribute.
+   * @see #getForeignKeyColumn()
+   * @generated
+   */
+  void setForeignKeyColumn(String value);
+
+  /**
+   * Returns the value of the '<em><b>Primary Key Column</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Primary Key Column</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Primary Key Column</em>' attribute.
+   * @see #setPrimaryKeyColumn(String)
+   * @generated
+   */
+  String getPrimaryKeyColumn();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn <em>Primary Key Column</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Primary Key Column</em>' attribute.
+   * @see #getPrimaryKeyColumn()
+   * @generated
+   */
+  void setPrimaryKeyColumn(String value);
+
+  /**
+   * Returns the value of the '<em><b>Relationship</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Relationship</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Relationship</em>' attribute.
+   * @see #setRelationship(String)
+   * @generated
+   */
+  String getRelationship();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.KeyPair#getRelationship <em>Relationship</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Relationship</em>' attribute.
+   * @see #getRelationship()
+   * @generated
+   */
+  void setRelationship(String value);
 
-}
+} // KeyPair

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java?rev=375688&r1=375687&r2=375688&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java Tue Feb  7 12:39:51 2006
@@ -6,7 +6,6 @@
  */
 package org.apache.tuscany.das.rdb.config;
 
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -16,95 +15,86 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Parameter#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.das.rdb.config.Parameter#getType <em>Type</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Parameter#getColumnType <em>Column Type</em>}</li>
  *   <li>{@link org.apache.tuscany.das.rdb.config.Parameter#getCommand <em>Command</em>}</li>
+ *   <li>{@link org.apache.tuscany.das.rdb.config.Parameter#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getParameter()
- * @model
  * @generated
  */
-public interface Parameter extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getParameter_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getParameter_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Command</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.apache.tuscany.das.rdb.config.Command#getParameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Command</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Command</em>' container reference.
-	 * @see #setCommand(Command)
-	 * @see org.apache.tuscany.das.rdb.config.ConfigPackage#getParameter_Command()
-	 * @see org.apache.tuscany.das.rdb.config.Command#getParameter
-	 * @model opposite="Parameter"
-	 * @generated
-	 */
-	Command getCommand();
-
-	/**
-	 * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getCommand <em>Command</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Command</em>' container reference.
-	 * @see #getCommand()
-	 * @generated
-	 */
-	void setCommand(Command value);
+public interface Parameter
+{
+  /**
+   * Returns the value of the '<em><b>Column Type</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Column Type</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Column Type</em>' attribute.
+   * @see #setColumnType(String)
+   * @generated
+   */
+  String getColumnType();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getColumnType <em>Column Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Column Type</em>' attribute.
+   * @see #getColumnType()
+   * @generated
+   */
+  void setColumnType(String value);
+
+  /**
+   * Returns the value of the '<em><b>Command</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Command</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Command</em>' attribute.
+   * @see #setCommand(String)
+   * @generated
+   */
+  String getCommand();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getCommand <em>Command</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Command</em>' attribute.
+   * @see #getCommand()
+   * @generated
+   */
+  void setCommand(String value);
+
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Parameter#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
 
 } // Parameter



Mime
View raw message