summaryrefslogtreecommitdiffstats
path: root/tags/java-stable-20060304/das/rdb/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java-stable-20060304/das/rdb/src/main/java/org')
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ApplyChangesCommand.java186
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java283
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandFactory.java67
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroup.java56
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java37
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java52
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Key.java58
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java62
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Parameter.java128
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ResultSetShape.java122
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/SDODataTypes.java68
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java306
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java156
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java121
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java108
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java175
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java100
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java100
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Relationship.java193
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ResultDescriptor.java150
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Table.java191
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ColumnImpl.java675
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/CommandImpl.java444
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigFactoryImpl.java212
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigImpl.java387
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigPackageImpl.java2808
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConnectionPropertiesImpl.java455
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/KeyPairImpl.java287
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ParameterImpl.java287
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/RelationshipImpl.java497
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ResultDescriptorImpl.java399
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/TableImpl.java517
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java381
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java41
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java44
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java124
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/CudGenerator.java64
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java98
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java164
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java206
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java120
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java91
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java98
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java105
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java277
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java137
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java169
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java140
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java52
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java75
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java43
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EAttributeMaker.java67
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EReferenceMaker.java131
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java261
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java133
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java176
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java172
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java71
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java225
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java81
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java80
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java15
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java195
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java177
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java95
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java29
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java130
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java25
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java72
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java38
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java49
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java79
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java80
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java45
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java64
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java107
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java150
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java87
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java204
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java100
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java73
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java206
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java25
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java42
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java30
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java97
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java166
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java73
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java34
-rw-r--r--tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java66
90 files changed, 0 insertions, 16066 deletions
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ApplyChangesCommand.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ApplyChangesCommand.java
deleted file mode 100644
index 0c53492d15..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ApplyChangesCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-
-/**
- * An ApplyChangesCommand is used to flush the changes associated with a
- * modified graph of DataObjects to a database.
- *
- *
- */
-public interface ApplyChangesCommand {
-
- /**
- * Adds a user-provided update command. In the absence of a user-provided
- * command, the DAS will generate one. However this alternative may make
- * sense if the user requires a SQL statement different from what the DAS
- * generates.
- *
- * @param type
- * The DataObject type this command applys to
- * @param cmd
- * The Command used to UPDATE data objects of the specified type
- */
- public void addUpdateCommand(Type type, Command cmd);
-
- /**
- * Adds a user-provided create command. In the absence of a user-provided
- * command, the DAS will generate one. However this alternative may make
- * sense if the user requires a SQL statement different from what the DAS
- * generates.
- *
- * @param type
- * The DataObject type this command applys to
- * @param cmd
- * The Command used to INSERT data objects of the specified type
- */
- public void addCreateCommand(Type type, Command cmd);
-
- /**
- * Adds a user-provided delete command. In the absence of a user-provided
- * command, the DAS will generate one. However this alternative may make
- * sense if the user requires a SQL statement different from what the DAS
- * generates.
- *
- * @param type
- * The DataObject type this command applys to
- * @param cmd
- * The Command used to DELETE data objects of the specified type
- */
- public void addDeleteCommand(Type type, Command cmd);
-
- /**
- * The change history is scanned and modifications to the graph of data
- * objects are flushed to the database.
- *
- * @param root
- * the topmost containing data object
- */
- public void execute(DataObject root);
-
- /**
- * TODO - Need to remove this. COnfig now set via factory method
- */
- public void setMapping(InputStream mappingModel) throws IOException;
-
- /**
- * Provides the java.sql.Connection to be used for this executing this
- * command.
- *
- * @param connection
- * the java.sql.Connection
- */
- public void setConnection(Connection connection);
-
- /**
- * Provides the java.sql.Connection to be used for this executing this
- * command.
- *
- * @param connection
- * the java.sql.Connection
- * @param manageTransactions
- * <code>true</code> if the DAS should perform tx
- * commit/rollback
- */
- public void setConnection(Connection connection, boolean manageTransactions);
-
- /**
- * Add relationship metadata necessary for processing query results. This is
- * an alternative to providing the same information in a config file.
- *
- * @param parent
- * a name identifying the relationship parent key (example:
- * "CUSTOMER.ID")
- * @param child
- * a name identifying the relationship child key
- * ("ORDER.CUSTOMER_ID")
- */
- public void addRelationship(String parent, String child);
-
- /**
- * Add relationship metadata necessary for processing query results. This is
- * an alternative to providing the same information in a config file.
- *
- * @param parentKey
- * the parent key for the relationship
- * @param childKey
- * the child key in the relationship
- * @see Key
- */
- public void addRelationship(Key parentKey, Key childKey);
-
- /**
- * Add primary key metadata. This is an alternative to providing the same
- * information in a config file.
- *
- * @param pk
- * the string identifying a prmary key. (Example: "CUSTOMER.ID")
- */
- public void addPrimaryKey(String columnName);
-
- /**
- * Add primary key metadata. This is an alternative to providing the same
- * information in a config file.
- *
- * @param key
- * the primary key
- * @see Key
- */
- public void addPrimaryKey(Key key);
-
- /**
- * Adds a column to be used in a optimistic concurrency control (OCC)
- * strategy. The generated UPDATE statement will include a overqualified
- * where clause using this column
- *
- * @param columnName
- * the name of the column to be used for OCC
- */
- public void addCollisionColumn(String columnName);
-
- /**
- * Add metadata that indicate a column is a generated primary key.
- *
- * @param string
- * the name of the generated primary key column. Example
- * ("COMPANY.ID")
- */
- public void addGeneratedPrimaryKey(String columnName);
-
- /**
- * Associate a {@link Converter} with a column to be used by this command.
- * This is an alternative to providing the same information in a config
- * file.
- *
- * @param name
- * the name of the column being assigned a converter (example:
- * "CUSTOMER.LASTNAME")
- * @param converterName
- * the name of the converter instance being assigned (example:
- * org.company.project.StringConverter)
- * @see Converter
- **/
- public void addConverter(String name, String converterName);
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
deleted file mode 100644
index 0f5534f705..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.sql.Connection;
-
-import org.apache.tuscany.das.rdb.impl.CommandFactoryImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-
-/**
- * A Command is used to execute a read or write to a database
- *
- *
- */
-public interface Command {
-
- public static CommandFactory FACTORY = new CommandFactoryImpl();
-
- /**
- * Performs the function defined by the command
- */
- public void execute();
-
- /**
- * Performs the function defined by the command and return the results in
- * the root DataObject
- *
- * @return the root DataObject
- */
- public DataObject executeQuery();
-
- /**
- * Returns the parameter associated with "name"
- *
- * @param name
- * the name of the parameter
- * @return the associated parameter
- */
- public Parameter getParameter(String name);
-
- /**
- * Returns the Parameter at index
- *
- * @param index
- * the index of the Parameter
- * @return the associated Parameter
- */
- public Parameter getParameter(int index);
-
- /**
- * Sets the value of the named Parameter
- *
- * @param name
- * the name of this Parameter
- * @param value
- * the value for the Parameter
- */
- public void setParameterValue(String name, Object value);
-
- /**
- * Sets the value of the associated Parameter
- *
- * @param index
- * the index of the Parameter
- * @param value
- * the value for the Parameter
- */
- public void setParameterValue(int index, Object value);
-
- /**
- * Sets the "type" of the associated Parameter
- *
- * @param name
- * the name of this Parameter
- * @param type
- * the SDODataTypes-defined "type" for the Parameter.
- */
- public void setParameterType(String string, Type dataType);
-
- /**
- * Sets the "type" of the associated Parameter
- *
- * @param index
- * the index of the Parameter
- * @param type
- * the SDODataTypes-defined "type" for the Parameter.
- */
- public void setParameterType(int index, Type dataType);
-
- /**
- * Returns the value of the associated Parameter
- *
- * @param name
- * the name of the Parameter
- * @return the value of the Parameter
- */
- public Object getParameterValue(String name);
-
- /**
- * Returns the value of the associated Parameter
- *
- * @param index
- * the index of the Parameter
- * @return the value of the Parameter
- */
- public Object getParameterValue(int index);
-
- /**
- * Adds a Parameter to the command
- *
- * @param index
- * the index of the parameter
- * @param sdoType
- * the commonj.sdo.Type of the Parameter
- */
- public void addParameter(int index, Type sdoType);
-
- /**
- * Adds a Parameter to the command
- *
- * @param name
- * the index of the parameter
- * @param sdoType
- * the commonj.sdo.Type of the Parameter
- */
- public void addParameter(String name, Type sdoType);
-
- /**
- * Adds a Parameter to the command
- *
- * @param index
- * the index of the parameter
- * @param direction
- * the direction of the Parameter. Either Parameter.IN,
- * Parameter.OUT or Parameter.INOUT
- * @param sdoType
- * specifies the type as a commonj.sdo.Type from
- * {@link SDODataTypes}
- */
- public void addParameter(int index, int direction, Type sdoType);
-
- /**
- * Adds a Parameter to the command
- *
- * @param name
- * the name associated with the Parameter
- * @param direction
- * the direction of the Parameter. Either Parameter.IN,
- * Parameter.OUT or Parameter.INOUT
- * @param sdoType
- * specifies the type as a commonj.sdo.Type from
- * {@link SDODataTypes}
- */
- public void addParameter(String name, int direction, Type sdoType);
-
- /**
- * Specifies an object model for a graph of DataObjects returned by
- * #executeQuery()
- *
- * @param schema
- * the model as a commonj.sdo.Type
- */
- public void setDataObjectModel(Type schema);
-
- /**
- * Defines the structure of the ResultSet returned by the JDBC Driver when
- * this command is executed. If the shape is not specified then the shape is
- * taken from the ResultSetMetatadta instance provided by the JDBC Driver.
- * <p>
- * This method is prvided primarily to support platforms (such as Oracle)
- * that do not provide complete support for ResultSetMetadata
- *
- * @param shape
- * the specified result set shape
- * @see ResultSetShape
- */
- public void setResultSetShape(ResultSetShape shape);
-
- /**
- * Provides the java.sql.Connection to be used for this executing this
- * command.
- *
- * @param connection
- * the java.sql.Connection
- */
- public void setConnection(Connection connection);
-
- /**
- * Provides the java.sql.Connection to be used for this executing this
- * command.
- *
- * @param connection
- * the java.sql.Connection
- * @param manageTransactions
- * <code>true</code> if the DAS should perform tx
- * commit/rollback
- */
- public void setConnection(Connection connection, boolean manageTransactions);
-
- /**
- * Add relationship metadata necessary for processing query results. This is
- * an alternative to providing the same information in a config file.
- *
- * @param parent
- * a name identifying the relationship parent key (example:
- * "CUSTOMER.ID")
- * @param child
- * a name identifying the relationship child key
- * ("ORDER.CUSTOMER_ID")
- */
- public void addRelationship(String parent, String child);
-
- /**
- * Add relationship metadata necessary for processing query results. This is
- * an alternative to providing the same information in a config file.
- *
- * @param parentKey
- * the parent key for the relationship
- * @param childKey
- * the child key in the relationship
- * @see Key
- */
- public void addRelationship(Key parentKey, Key childKey);
-
- /**
- * Add primary key metadata. This is an alternative to providing the same
- * information in a config file.
- *
- * @param pk
- * the string identifying a prmary key. (Example: "CUSTOMER.ID")
- */
- public void addPrimaryKey(String pk);
-
- /**
- * Add primary key metadata. This is an alternative to providing the same
- * information in a config file.
- *
- * @param key
- * the primary key
- * @see Key
- */
- public void addPrimaryKey(Key key);
-
- /**
- * Associate a {@link Converter} with a column to be used by this command.
- * This is an alternative to providing the same information in a config
- * file.
- *
- * @param name
- * the name of the column being assigned a converter (example:
- * "CUSTOMER.LASTNAME")
- * @param converterName
- * the name of the converter instance being assigned (example:
- * org.company.project.StringConverter)
- * @see Converter
- */
- public void addConverter(String name, String converterName);
-
- /**
- * Cleans up and realeases all resources associated with this command. This
- * should be called when the application is done with this command.
- */
- public void close();
-
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandFactory.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandFactory.java
deleted file mode 100644
index c68855ec2a..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A CommandFactory produces {@link Command} and {@link ApplyChangesCommand}
- * instances.
- *
- *
- */
-public interface CommandFactory {
-
- /**
- * Creates a Command based on the provided SQL statement
- *
- * @param sql
- * The SQL statement
- * @return returns a Command instance
- */
- public Command createCommand(String sql);
-
- /**
- * Creates a Command based on the provided SQL statement and configuration
- *
- * @param sql
- * The SQL statement
- * @param mappingModel
- * The congiguration as XML file stream
- * @return returns a COmmand instance
- */
- public Command createCommand(String sql, InputStream mappingModel);
-
- /**
- * Creates an {@linkApplyChangesCommand} instance
- * @return Returns the ApplyChangesCommand instance
- */
- public ApplyChangesCommand createApplyChangesCommand();
-
- /**
- * Creates an {@linkApplyChangesCommand} instance with the provided configuration
- * @param mappingModel The provided configuration as a stream over an xml file
- * @return Returns an ApplyChangesCOmmand in stance
- * @throws IOException
- * TODO - Either remove this throws clause or add it to createCommand
- */
- public ApplyChangesCommand createApplyChangesCommand(
- InputStream mappingModel) throws IOException;
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroup.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroup.java
deleted file mode 100644
index 5a39e0d390..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroup.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.sql.Connection;
-
-import org.apache.tuscany.das.rdb.impl.CommandGroupFactoryImpl;
-
-/**
- * A CommandGroup represents a set of {@link Command} and single
- * {@link ApplyChangesCommand} that are created from a common config file.
- *
- *
- */
-public interface CommandGroup {
-
- public static CommandGroupFactory FACTORY = new CommandGroupFactoryImpl();
-
- /**
- * Return the ApplyChangesCommnad for this configured factory
- *
- * @return Returns an instance of ApplyChangesCommand
- */
- public ApplyChangesCommand getApplyChangesCommand();
-
- /**
- * Gets the named command from this factory's inventory
- *
- * @param name
- * The identifying name of the requested command
- * @return Returns the identified command
- */
- public Command getCommand(String name);
-
- /**
- * Set the default connection for all command in the group
- *
- * @param connection
- */
- public void setConnection(Connection connection);
-
-} \ No newline at end of file
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java
deleted file mode 100644
index dfcdd81823..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/CommandGroupFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.io.InputStream;
-
-/**
- * A CommandGroupFactory produces {@link CommandGroup} instances.
- *
- *
- */
-public interface CommandGroupFactory {
-
- /**
- * Creates a CommandGroup based on the provided config file stream
- *
- * @param configStream
- * A stream over a DAS config file
- * @return returns a CommandGroup instance
- */
- public CommandGroup createCommandGroup(InputStream configStream);
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
deleted file mode 100644
index 8110d2c5a5..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-/**
- * A lightweight Tabele-column <--> DataObject-property converter framework.
- * Converters allow a user to insert a transformation between a column value and
- * is destination DataObject property value. For example, by default, a VARCHAR
- * column will be represented as a String in its corresponding DataObject
- * property. A user could insert a converter that transforms the the VARCHAR
- * value to an Integer. If this is done then although the column returns
- * character data, the DataObject property will be an Integer
- *
- *
- */
-public interface Converter {
-
- /**
- * Transform the columnData object to a new value and possibly new type.
- * This should be the invers operation of #getColumnValue
- *
- * @param columnData
- * The column value to transorm
- * @return Returns the transformed value
- */
- public Object getPropertyValue(Object columnData);
-
- /**
- * Transform the columnData object to a new value and possibly new type.
- * This should be the invers operation of #getPropertyValue
- *
- * @param propertyData
- * The property value to transform
- * @return Returns the transformed value
- */
- public Object getColumnValue(Object propertyData);
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Key.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Key.java
deleted file mode 100644
index 4622b2a8fb..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Key.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A key instance is used to describe a Table key definition. This is used
- * primarily for compound keys since simple keys are described with a name.
- *
- *
- */public class Key {
-
- private List columnNames = new ArrayList();
-
- /**
- * Contructor for a single column key
- * @param columnName The single column fo rthe key
- */
- public Key(String columnName) {
- super();
- this.columnNames.add(columnName);
- }
-
- /**
- * Constructor for a compound key
- * @param columns The array of column names that compose the key
- */
- public Key(String[] columns) {
- for (int i=0;i<columns.length; i++) {
- this.columnNames.add(columns[i]);
- }
- }
-
- /**
- * Returns a List of column names that compose the key
- * @return a list of column names
- */
- public List getColumNames() {
- return this.columnNames;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
deleted file mode 100644
index 4edb447e31..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import commonj.sdo.DataObject;
-
-/**
- * An iterator-like interface to conveniently move through chunks of data. The
- * idea is that a Pager works with a read Command. The read command returns a
- * large amount of data and the client wants to work with chunks of it at a
- * time. So the Pager is created on the command and each call to next returns
- * the next chunk of data. This is done completely disconnected. No cursor is
- * maintained between calls to #next.
- *
- * TODO - This is very preliminary. We need to look at this interface in the
- * context of disonnected scenarios such as a web app. The Pager instance will
- * probably be saved in session so it must be very light and cannot reference a
- * connection. Also, we probably need to define a factory or add a method to set
- * page size.
- *
- *
- */
-public interface Pager {
-
- /**
- * Get the next page of data
- *
- * @return the next page of data
- */
- public DataObject next();
-
- /**
- * Get the page prior to the last page returned
- *
- * @return the previous page
- */
- public DataObject previous();
-
- /**
- * Return a specific identified page.
- *
- * @param page
- * The number of the page to return
- * @return the indicated page
- */
- public DataObject getPage(int page);
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Parameter.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Parameter.java
deleted file mode 100644
index 89251cbd0f..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Parameter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import commonj.sdo.Type;
-
-/**
- * Describes a single parameter for a parameterized SQL statement.
- *
- *
- */
-public interface Parameter {
-
- /**
- * Value for "Direction" that indicates that a parameter is soley for input.
- */
- final static int IN = 1;
-
- /**
- * Value for "Direction" that indicates that a parameter is soley for
- * output. Out parameters only apply to Stored Procedures
- */
- final static int OUT = 2;
-
- /**
- * Value for "Direction" that indicates that a parameter is for both input
- * and output. In-out parameters only apply to stored procedures
- */
- final static int IN_OUT = 3;
-
- /**
- * A parameter has a type in terms of SDO2 DataTypes. Legal values are
- * provided in {@link SDODataTypes}
- * <p>
- * Explicit definition of type is required only for OUT parameters of stored
- * procedures commands
- *
- * @param type
- */
- public void setType(Type type);
-
- /**
- * Set the index of the parameter. For example, if a SQL statement requires
- * two parameters, the first one has an index of one.
- *
- * @param index
- * The index of the parameter
- */
- public void setIndex(int index);
-
- /**
- * Sets the name of the parameter
- *
- * @param name
- * the parameter name
- */
- public void setName(String name);
-
- /**
- * Sets the value of the parameter. All IN and IN_OUT parameters must be set
- * beore a command can be executed.
- *
- * @param value
- * The value for the parameter
- */
- public void setValue(Object value);
-
- /**
- * Parameters are typically IN and this is the default. A parameter's
- * direction must be set when the parameter is OUT or IN_OUT.
- *
- * @param direction
- * the parameters direction
- */
- public void setDirection(int direction);
-
- /**
- * TODO Not sure this method is needed.
- * @param converter
- */
- public void setConverter(Converter converter);
-
- /**
- * @return the type of the paramater in terms of {@link SDODataTypes}
- */
- public Type getType();
-
- /**
- * TODO Not sure this is is needed.
- * @return
- */
- public Converter getConverter();
-
- /**
- * @return the index of the parameter
- */
- public int getIndex();
-
- /**
- * @return the name of the parameter
- */
- public String getName();
-
- /**
- * @return the value of the parameter
- */
- public Object getValue();
-
- /**
- * @return the direction of the parameter
- */
- public int getDirection();
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ResultSetShape.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ResultSetShape.java
deleted file mode 100644
index 52d4487963..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ResultSetShape.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-import org.apache.tuscany.das.rdb.graphbuilder.impl.DefaultConverter;
-import org.apache.tuscany.das.rdb.graphbuilder.schema.ResultSetTypeMap;
-
-import commonj.sdo.Type;
-
-/**
- * Describes the structure of the result set returned from execution
- * of a SELECT statement. This description is typcially not required since the
- * shape can be retreived from the JDBC ResultSetMetadata. However, some platforms
- * such as Oracle do not support fully suport ResultSetMedata.
- * <p>
- * There may also be a performance boost when using this interface.
- *
- * TODO - This is very preliminary. We need to go over this again and consider making is as close as possible to
- * to the infromation returned from ResultSetMetadata. For example, we may want to use JDBC types
- * here rather than SDODataTypes. Also, ResultSetMetadata doe not provide converters, so, maybe this
- * interface should also not.
- *
- *
- */
-public class ResultSetShape {
-
- private final String[] columns;
- private final String[] tables;
- private final Type[] types;
- //TODO - Are converters really needed here?
- private Converter[] converters;
-
- public ResultSetShape(String[] t, String[] c, Type[] dataTypes) {
- this.columns = c;
- this.tables = t;
- this.types = dataTypes;
- this.converters = new DefaultConverter[c.length];
- }
-
- public ResultSetShape(ResultSetMetaData metadata) throws SQLException {
- columns = new String[metadata.getColumnCount()];
- tables = new String[metadata.getColumnCount()];
- types = new Type[metadata.getColumnCount()];
- converters = new DefaultConverter[metadata.getColumnCount()];
-
- ResultSetTypeMap typeMap = ResultSetTypeMap.instance;
- for (int i = 1; i <= metadata.getColumnCount(); i++) {
- tables[i-1] = metadata.getTableName(i);
- columns[i-1] = metadata.getColumnName(i);
- types[i-1] = typeMap.getType(metadata.getColumnType(i), true);
- }
- }
-
- public int getColumnCount() {
- return columns.length;
- }
-
- public String getTableName(int i) {
- return tables[i-1];
- }
-
- public String getColumnName(int i) {
- return columns[i-1];
- }
-
- public Type getColumnType(int i) {
- return types[i-1];
- }
-
- public void setConverter(int i, Converter converter) {
- this.converters[i] = converter;
- }
-
- public Converter getConverter(int i) {
- return this.converters[i-1];
- }
-
- public void setConverterFactory(Converter converter) {
- for ( int i=0; i < getColumnCount(); i++ ) {
- this.converters[i] = converter;
- }
-
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer();
- result.append(" column/table/type: ");
- for (int i=0; i < columns.length; i++) {
- result.append(columns[i]);
- result.append('\t');
- result.append(tables[i]);
- result.append('\t');
- if ( types[i] == null )
- result.append("null");
- else
- result.append(types[i].getName());
- result.append('\t');
- result.append(converters[i]);
- result.append('\n');
- }
-
- return result.toString();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/SDODataTypes.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/SDODataTypes.java
deleted file mode 100644
index 65184c88cb..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/SDODataTypes.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * Defines SDO data types. This is used primalirly to type stored procedure OUT parameters.
- *
- * TODO - This maybe be obviated by the move to SDO2. We also need to settle the question
- * of whether config information is in terms of database or data object types
- *
- *
- */public class SDODataTypes {
-
- static TypeHelper helper = TypeHelper.INSTANCE;
-
- final public static Type BOOLEAN = helper.getType("commonj.sdo", "Boolean");
- final public static Type BYTE = helper.getType("commonj.sdo", "Byte");
- final public static Type BYTES = helper.getType("commonj.sdo", "ByteArray");
- final public static Type CHARACTER = helper.getType("commonj.sdo", "Char");
- final public static Type DATE = helper.getType("commonj.sdo", "Date");
- final public static Type DATETIME = helper.getType("commonj.sdo", "Date");
- final public static Type DAY = helper.getType("commonj.sdo", "Date");
- final public static Type DECIMAL = helper.getType("commonj.sdo", "Float");
- final public static Type DOUBLE =helper.getType("commonj.sdo", "Double");
- final public static Type DURATION = helper.getType("commonj.sdo", "Date");
- final public static Type FLOAT = helper.getType("commonj.sdo", "Float");
- final public static Type INT = helper.getType("commonj.sdo", "Int");
- final public static Type INTEGER = helper.getType("commonj.sdo", "Integer");
- final public static Type LONG = helper.getType("commonj.sdo", "Long");
- final public static Type MONTH = helper.getType("commonj.sdo", "Date");
- final public static Type MONTHDAY = helper.getType("commonj.sdo", "Date");
- final public static Type OBJECT = helper.getType("commonj.sdo", "Object");
- final public static Type SHORT = helper.getType("commonj.sdo", "Short");
- final public static Type STRING = helper.getType("commonj.sdo", "String");
- final public static Type STRINGS = helper.getType("commonj.sdo", "String");
- final public static Type TIME = helper.getType("commonj.sdo", "Date");
- final public static Type URI = helper.getType("commonj.sdo", "String");
- final public static Type YEAR = helper.getType("commonj.sdo", "Date");
- final public static Type YEARMONTH = helper.getType("commonj.sdo", "Date");
- final public static Type YEARMONTHDAY = helper.getType("commonj.sdo", "Date");
- final public static Type BOOLEANOBJECT = helper.getType("commonj.sdo", "BooleanObject");
- final public static Type BYTEOBJECT = helper.getType("commonj.sdo", "ByteObject");
- final public static Type CHARACTEROBJECT = helper.getType("commonj.sdo", "CharacterObject");
- final public static Type DOUBLEOBJECT = helper.getType("commonj.sdo", "DoubleObject");
- final public static Type FLOATOBJECT = helper.getType("commonj.sdo", "FloatObject");
- final public static Type INTEGEROBJECT = helper.getType("commonj.sdo", "IntObject");
- final public static Type LONGOBJECT = helper.getType("commonj.sdo", "LongObject");
- final public static Type SHORTOBJECT = helper.getType("commonj.sdo", "ShortObject");
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java
deleted file mode 100644
index e004726fbe..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Column.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Column</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <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#isGenerated <em>Generated</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>
- *
- * @generated
- */
-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);
-
-} // Column
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java
deleted file mode 100644
index 3bce9e601e..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Command.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Command</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <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>
- *
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java
deleted file mode 100644
index c00d946dac..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Config.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <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>
- *
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java
deleted file mode 100644
index f3c25814ac..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConfigFactory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- 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 -->
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java
deleted file mode 100644
index 4b4008b446..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ConnectionProperties.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection Properties</b></em>'.
- * <!-- end-user-doc -->
- *
- * <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#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>
- * </ul>
- * </p>
- *
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java
deleted file mode 100644
index 7a1759ee90..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/KeyPair.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Key Pair</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <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>
- *
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java
deleted file mode 100644
index 63872a7afd..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Parameter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <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>
- *
- * @generated
- */
-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
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Relationship.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Relationship.java
deleted file mode 100644
index d63348ade1..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Relationship.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Relationship</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#getKeyPair <em>Key Pair</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#getForeignKeyTable <em>Foreign Key Table</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#isMany <em>Many</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Relationship#getPrimaryKeyTable <em>Primary Key Table</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface Relationship
-{
- /**
- * Returns the value of the '<em><b>Key Pair</b></em>' containment reference list.
- * The list contents are of type {@link org.apache.tuscany.das.rdb.config.KeyPair}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Key Pair</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>Key Pair</em>' containment reference list.
- * @generated
- */
- List getKeyPair();
-
- /**
- * 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.Relationship#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>Foreign Key Table</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Foreign Key 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>Foreign Key Table</em>' attribute.
- * @see #setForeignKeyTable(String)
- * @generated
- */
- String getForeignKeyTable();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Relationship#getForeignKeyTable <em>Foreign Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Foreign Key Table</em>' attribute.
- * @see #getForeignKeyTable()
- * @generated
- */
- void setForeignKeyTable(String value);
-
- /**
- * Returns the value of the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Many</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Many</em>' attribute.
- * @see #isSetMany()
- * @see #unsetMany()
- * @see #setMany(boolean)
- * @generated
- */
- boolean isMany();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Relationship#isMany <em>Many</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Many</em>' attribute.
- * @see #isSetMany()
- * @see #unsetMany()
- * @see #isMany()
- * @generated
- */
- void setMany(boolean value);
-
- /**
- * Unsets the value of the '{@link org.apache.tuscany.das.rdb.config.Relationship#isMany <em>Many</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetMany()
- * @see #isMany()
- * @see #setMany(boolean)
- * @generated
- */
- void unsetMany();
-
- /**
- * Returns whether the value of the '{@link org.apache.tuscany.das.rdb.config.Relationship#isMany <em>Many</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Many</em>' attribute is set.
- * @see #unsetMany()
- * @see #isMany()
- * @see #setMany(boolean)
- * @generated
- */
- boolean isSetMany();
-
- /**
- * 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.Relationship#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 Table</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Primary Key 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>Primary Key Table</em>' attribute.
- * @see #setPrimaryKeyTable(String)
- * @generated
- */
- String getPrimaryKeyTable();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Relationship#getPrimaryKeyTable <em>Primary Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Primary Key Table</em>' attribute.
- * @see #getPrimaryKeyTable()
- * @generated
- */
- void setPrimaryKeyTable(String value);
-
-} // Relationship
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ResultDescriptor.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ResultDescriptor.java
deleted file mode 100644
index 648c33bf7e..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/ResultDescriptor.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Result Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnName <em>Column Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnType <em>Column Type</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getCommand <em>Command</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getConverter <em>Converter</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getTableName <em>Table Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface ResultDescriptor
-{
- /**
- * Returns the value of the '<em><b>Column Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Column 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>Column Name</em>' attribute.
- * @see #setColumnName(String)
- * @generated
- */
- String getColumnName();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnName <em>Column Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Column Name</em>' attribute.
- * @see #getColumnName()
- * @generated
- */
- void setColumnName(String value);
-
- /**
- * 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.ResultDescriptor#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.ResultDescriptor#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>Converter</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Converter</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</em>' attribute.
- * @see #setConverter(String)
- * @generated
- */
- String getConverter();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getConverter <em>Converter</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Converter</em>' attribute.
- * @see #getConverter()
- * @generated
- */
- void setConverter(String value);
-
- /**
- * Returns the value of the '<em><b>Table Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Table 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>Table Name</em>' attribute.
- * @see #setTableName(String)
- * @generated
- */
- String getTableName();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getTableName <em>Table Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Table Name</em>' attribute.
- * @see #getTableName()
- * @generated
- */
- void setTableName(String value);
-
-} // ResultDescriptor
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Table.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Table.java
deleted file mode 100644
index 8f0956f291..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/Table.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getColumn <em>Column</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getCreate <em>Create</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getDelete <em>Delete</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getPropertyName <em>Property Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.Table#getUpdate <em>Update</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface Table
-{
- /**
- * Returns the value of the '<em><b>Column</b></em>' containment reference list.
- * The list contents are of type {@link org.apache.tuscany.das.rdb.config.Column}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Column</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>Column</em>' containment reference list.
- * @generated
- */
- List getColumn();
-
- /**
- * 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.Table#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>Create</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Create</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Create</em>' attribute.
- * @see #setCreate(String)
- * @generated
- */
- String getCreate();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Table#getCreate <em>Create</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Create</em>' attribute.
- * @see #getCreate()
- * @generated
- */
- void setCreate(String value);
-
- /**
- * Returns the value of the '<em><b>Delete</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Delete</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Delete</em>' attribute.
- * @see #setDelete(String)
- * @generated
- */
- String getDelete();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Table#getDelete <em>Delete</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Delete</em>' attribute.
- * @see #getDelete()
- * @generated
- */
- void setDelete(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.Table#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)
- * @generated
- */
- String getPropertyName();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Table#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>Update</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Update</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Update</em>' attribute.
- * @see #setUpdate(String)
- * @generated
- */
- String getUpdate();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.das.rdb.config.Table#getUpdate <em>Update</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Update</em>' attribute.
- * @see #getUpdate()
- * @generated
- */
- void setUpdate(String value);
-
-} // Table
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ColumnImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ColumnImpl.java
deleted file mode 100644
index 30be8870b3..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ColumnImpl.java
+++ /dev/null
@@ -1,675 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.Column;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Column</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#isCollision <em>Collision</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#getColumnType <em>Column Type</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#getConverterClassName <em>Converter Class Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#isGenerated <em>Generated</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#isPrimaryKey <em>Primary Key</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#getPropertyName <em>Property Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl#getTable <em>Table</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ColumnImpl extends DataObjectImpl implements Column
-{
- /**
- * The default value of the '{@link #isCollision() <em>Collision</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isCollision()
- * @generated
- * @ordered
- */
- protected static final boolean COLLISION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isCollision() <em>Collision</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isCollision()
- * @generated
- * @ordered
- */
- protected boolean collision = COLLISION_EDEFAULT;
-
- /**
- * This is true if the Collision attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected boolean collisionESet = false;
-
- /**
- * The default value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected static final String COLUMN_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected String columnType = COLUMN_TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getConverterClassName() <em>Converter Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterClassName()
- * @generated
- * @ordered
- */
- protected static final String CONVERTER_CLASS_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConverterClassName() <em>Converter Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterClassName()
- * @generated
- * @ordered
- */
- protected String converterClassName = CONVERTER_CLASS_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #isGenerated() <em>Generated</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerated()
- * @generated
- * @ordered
- */
- protected static final boolean GENERATED_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isGenerated() <em>Generated</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isGenerated()
- * @generated
- * @ordered
- */
- protected boolean generated = GENERATED_EDEFAULT;
-
- /**
- * This is true if the Generated attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected boolean generatedESet = false;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #isPrimaryKey() <em>Primary Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPrimaryKey()
- * @generated
- * @ordered
- */
- protected static final boolean PRIMARY_KEY_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isPrimaryKey() <em>Primary Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPrimaryKey()
- * @generated
- * @ordered
- */
- protected boolean primaryKey = PRIMARY_KEY_EDEFAULT;
-
- /**
- * This is true if the Primary Key attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected boolean primaryKeyESet = false;
-
- /**
- * The default value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPropertyName()
- * @generated
- * @ordered
- */
- protected static final String PROPERTY_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPropertyName()
- * @generated
- * @ordered
- */
- protected String propertyName = PROPERTY_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTable()
- * @generated
- * @ordered
- */
- protected static final String TABLE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTable()
- * @generated
- * @ordered
- */
- protected String table = TABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ColumnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.COLUMN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isCollision()
- {
- return collision;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCollision(boolean newCollision)
- {
- boolean oldCollision = collision;
- collision = newCollision;
- boolean oldCollisionESet = collisionESet;
- collisionESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__COLLISION, oldCollision, collision, !oldCollisionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetCollision()
- {
- boolean oldCollision = collision;
- boolean oldCollisionESet = collisionESet;
- collision = COLLISION_EDEFAULT;
- collisionESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, ConfigPackageImpl.COLUMN__COLLISION, oldCollision, COLLISION_EDEFAULT, oldCollisionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetCollision()
- {
- return collisionESet;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getColumnType()
- {
- return columnType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setColumnType(String newColumnType)
- {
- String oldColumnType = columnType;
- columnType = newColumnType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__COLUMN_TYPE, oldColumnType, columnType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConverterClassName()
- {
- return converterClassName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConverterClassName(String newConverterClassName)
- {
- String oldConverterClassName = converterClassName;
- converterClassName = newConverterClassName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__CONVERTER_CLASS_NAME, oldConverterClassName, converterClassName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isGenerated()
- {
- return generated;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setGenerated(boolean newGenerated)
- {
- boolean oldGenerated = generated;
- generated = newGenerated;
- boolean oldGeneratedESet = generatedESet;
- generatedESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__GENERATED, oldGenerated, generated, !oldGeneratedESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetGenerated()
- {
- boolean oldGenerated = generated;
- boolean oldGeneratedESet = generatedESet;
- generated = GENERATED_EDEFAULT;
- generatedESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, ConfigPackageImpl.COLUMN__GENERATED, oldGenerated, GENERATED_EDEFAULT, oldGeneratedESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetGenerated()
- {
- return generatedESet;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isPrimaryKey()
- {
- return primaryKey;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPrimaryKey(boolean newPrimaryKey)
- {
- boolean oldPrimaryKey = primaryKey;
- primaryKey = newPrimaryKey;
- boolean oldPrimaryKeyESet = primaryKeyESet;
- primaryKeyESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__PRIMARY_KEY, oldPrimaryKey, primaryKey, !oldPrimaryKeyESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetPrimaryKey()
- {
- boolean oldPrimaryKey = primaryKey;
- boolean oldPrimaryKeyESet = primaryKeyESet;
- primaryKey = PRIMARY_KEY_EDEFAULT;
- primaryKeyESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, ConfigPackageImpl.COLUMN__PRIMARY_KEY, oldPrimaryKey, PRIMARY_KEY_EDEFAULT, oldPrimaryKeyESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetPrimaryKey()
- {
- return primaryKeyESet;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPropertyName()
- {
- return propertyName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPropertyName(String newPropertyName)
- {
- String oldPropertyName = propertyName;
- propertyName = newPropertyName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__PROPERTY_NAME, oldPropertyName, propertyName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTable()
- {
- return table;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTable(String newTable)
- {
- String oldTable = table;
- table = newTable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COLUMN__TABLE, oldTable, table));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COLUMN__COLLISION:
- return isCollision() ? Boolean.TRUE : Boolean.FALSE;
- case ConfigPackageImpl.COLUMN__COLUMN_TYPE:
- return getColumnType();
- case ConfigPackageImpl.COLUMN__CONVERTER_CLASS_NAME:
- return getConverterClassName();
- case ConfigPackageImpl.COLUMN__GENERATED:
- return isGenerated() ? Boolean.TRUE : Boolean.FALSE;
- case ConfigPackageImpl.COLUMN__NAME:
- return getName();
- case ConfigPackageImpl.COLUMN__PRIMARY_KEY:
- return isPrimaryKey() ? Boolean.TRUE : Boolean.FALSE;
- case ConfigPackageImpl.COLUMN__PROPERTY_NAME:
- return getPropertyName();
- case ConfigPackageImpl.COLUMN__TABLE:
- return getTable();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COLUMN__COLLISION:
- setCollision(((Boolean)newValue).booleanValue());
- return;
- case ConfigPackageImpl.COLUMN__COLUMN_TYPE:
- setColumnType((String)newValue);
- return;
- case ConfigPackageImpl.COLUMN__CONVERTER_CLASS_NAME:
- setConverterClassName((String)newValue);
- return;
- case ConfigPackageImpl.COLUMN__GENERATED:
- setGenerated(((Boolean)newValue).booleanValue());
- return;
- case ConfigPackageImpl.COLUMN__NAME:
- setName((String)newValue);
- return;
- case ConfigPackageImpl.COLUMN__PRIMARY_KEY:
- setPrimaryKey(((Boolean)newValue).booleanValue());
- return;
- case ConfigPackageImpl.COLUMN__PROPERTY_NAME:
- setPropertyName((String)newValue);
- return;
- case ConfigPackageImpl.COLUMN__TABLE:
- setTable((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COLUMN__COLLISION:
- unsetCollision();
- return;
- case ConfigPackageImpl.COLUMN__COLUMN_TYPE:
- setColumnType(COLUMN_TYPE_EDEFAULT);
- return;
- case ConfigPackageImpl.COLUMN__CONVERTER_CLASS_NAME:
- setConverterClassName(CONVERTER_CLASS_NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.COLUMN__GENERATED:
- unsetGenerated();
- return;
- case ConfigPackageImpl.COLUMN__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.COLUMN__PRIMARY_KEY:
- unsetPrimaryKey();
- return;
- case ConfigPackageImpl.COLUMN__PROPERTY_NAME:
- setPropertyName(PROPERTY_NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.COLUMN__TABLE:
- setTable(TABLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COLUMN__COLLISION:
- return isSetCollision();
- case ConfigPackageImpl.COLUMN__COLUMN_TYPE:
- return COLUMN_TYPE_EDEFAULT == null ? columnType != null : !COLUMN_TYPE_EDEFAULT.equals(columnType);
- case ConfigPackageImpl.COLUMN__CONVERTER_CLASS_NAME:
- return CONVERTER_CLASS_NAME_EDEFAULT == null ? converterClassName != null : !CONVERTER_CLASS_NAME_EDEFAULT.equals(converterClassName);
- case ConfigPackageImpl.COLUMN__GENERATED:
- return isSetGenerated();
- case ConfigPackageImpl.COLUMN__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ConfigPackageImpl.COLUMN__PRIMARY_KEY:
- return isSetPrimaryKey();
- case ConfigPackageImpl.COLUMN__PROPERTY_NAME:
- return PROPERTY_NAME_EDEFAULT == null ? propertyName != null : !PROPERTY_NAME_EDEFAULT.equals(propertyName);
- case ConfigPackageImpl.COLUMN__TABLE:
- return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (collision: ");
- if (collisionESet) result.append(collision); else result.append("<unset>");
- result.append(", columnType: ");
- result.append(columnType);
- result.append(", converterClassName: ");
- result.append(converterClassName);
- result.append(", generated: ");
- if (generatedESet) result.append(generated); else result.append("<unset>");
- result.append(", name: ");
- result.append(name);
- result.append(", primaryKey: ");
- if (primaryKeyESet) result.append(primaryKey); else result.append("<unset>");
- result.append(", propertyName: ");
- result.append(propertyName);
- result.append(", table: ");
- result.append(table);
- result.append(')');
- return result.toString();
- }
-
-} //ColumnImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/CommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/CommandImpl.java
deleted file mode 100644
index 7750d34ded..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/CommandImpl.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.Command;
-import org.apache.tuscany.das.rdb.config.Parameter;
-import org.apache.tuscany.das.rdb.config.ResultDescriptor;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Command</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getParameter <em>Parameter</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getResultDescriptor <em>Result Descriptor</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getKind <em>Kind</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl#getSQL <em>SQL</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CommandImpl extends DataObjectImpl implements Command
-{
- /**
- * The cached value of the '{@link #getParameter() <em>Parameter</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameter()
- * @generated
- * @ordered
- */
- protected EList parameter = null;
-
- /**
- * The cached value of the '{@link #getResultDescriptor() <em>Result Descriptor</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getResultDescriptor()
- * @generated
- * @ordered
- */
- protected EList resultDescriptor = null;
-
- /**
- * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected String config = CONFIG_EDEFAULT;
-
- /**
- * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKind()
- * @generated
- * @ordered
- */
- protected static final String KIND_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKind()
- * @generated
- * @ordered
- */
- protected String kind = KIND_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSQL() <em>SQL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSQL()
- * @generated
- * @ordered
- */
- protected static final String SQL_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSQL() <em>SQL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSQL()
- * @generated
- * @ordered
- */
- protected String sQL = SQL_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CommandImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.COMMAND;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getParameter()
- {
- if (parameter == null)
- {
- parameter = new EObjectContainmentEList(Parameter.class, this, ConfigPackageImpl.COMMAND__PARAMETER);
- }
- return parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getResultDescriptor()
- {
- if (resultDescriptor == null)
- {
- resultDescriptor = new EObjectContainmentEList(ResultDescriptor.class, this, ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR);
- }
- return resultDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfig()
- {
- return config;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfig(String newConfig)
- {
- String oldConfig = config;
- config = newConfig;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COMMAND__CONFIG, oldConfig, config));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getKind()
- {
- return kind;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setKind(String newKind)
- {
- String oldKind = kind;
- kind = newKind;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COMMAND__KIND, oldKind, kind));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COMMAND__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSQL()
- {
- return sQL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSQL(String newSQL)
- {
- String oldSQL = sQL;
- sQL = newSQL;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.COMMAND__SQL, oldSQL, sQL));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COMMAND__PARAMETER:
- return ((InternalEList)getParameter()).basicRemove(otherEnd, msgs);
- case ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR:
- return ((InternalEList)getResultDescriptor()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COMMAND__PARAMETER:
- return getParameter();
- case ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR:
- return getResultDescriptor();
- case ConfigPackageImpl.COMMAND__CONFIG:
- return getConfig();
- case ConfigPackageImpl.COMMAND__KIND:
- return getKind();
- case ConfigPackageImpl.COMMAND__NAME:
- return getName();
- case ConfigPackageImpl.COMMAND__SQL:
- return getSQL();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COMMAND__PARAMETER:
- getParameter().clear();
- getParameter().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR:
- getResultDescriptor().clear();
- getResultDescriptor().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.COMMAND__CONFIG:
- setConfig((String)newValue);
- return;
- case ConfigPackageImpl.COMMAND__KIND:
- setKind((String)newValue);
- return;
- case ConfigPackageImpl.COMMAND__NAME:
- setName((String)newValue);
- return;
- case ConfigPackageImpl.COMMAND__SQL:
- setSQL((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COMMAND__PARAMETER:
- getParameter().clear();
- return;
- case ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR:
- getResultDescriptor().clear();
- return;
- case ConfigPackageImpl.COMMAND__CONFIG:
- setConfig(CONFIG_EDEFAULT);
- return;
- case ConfigPackageImpl.COMMAND__KIND:
- setKind(KIND_EDEFAULT);
- return;
- case ConfigPackageImpl.COMMAND__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.COMMAND__SQL:
- setSQL(SQL_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.COMMAND__PARAMETER:
- return parameter != null && !parameter.isEmpty();
- case ConfigPackageImpl.COMMAND__RESULT_DESCRIPTOR:
- return resultDescriptor != null && !resultDescriptor.isEmpty();
- case ConfigPackageImpl.COMMAND__CONFIG:
- return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
- case ConfigPackageImpl.COMMAND__KIND:
- return KIND_EDEFAULT == null ? kind != null : !KIND_EDEFAULT.equals(kind);
- case ConfigPackageImpl.COMMAND__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ConfigPackageImpl.COMMAND__SQL:
- return SQL_EDEFAULT == null ? sQL != null : !SQL_EDEFAULT.equals(sQL);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (config: ");
- result.append(config);
- result.append(", kind: ");
- result.append(kind);
- result.append(", name: ");
- result.append(name);
- result.append(", sQL: ");
- result.append(sQL);
- result.append(')');
- return result.toString();
- }
-
-} //CommandImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigFactoryImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigFactoryImpl.java
deleted file mode 100644
index 7f67ad8e76..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigFactoryImpl.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigFactoryImpl extends EFactoryImpl implements ConfigFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final ConfigFactoryImpl eINSTANCE = init();
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static ConfigFactoryImpl init()
- {
- try
- {
- ConfigFactoryImpl theConfigFactory = (ConfigFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http:///org.apache.tuscany.das.rdb/config.xsd");
- if (theConfigFactory != null)
- {
- return theConfigFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new ConfigFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigFactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case ConfigPackageImpl.COLUMN: return (EObject)createColumn();
- case ConfigPackageImpl.COMMAND: return (EObject)createCommand();
- case ConfigPackageImpl.CONFIG: return (EObject)createConfig();
- case ConfigPackageImpl.CONNECTION_PROPERTIES: return (EObject)createConnectionProperties();
- case ConfigPackageImpl.KEY_PAIR: return (EObject)createKeyPair();
- case ConfigPackageImpl.PARAMETER: return (EObject)createParameter();
- case ConfigPackageImpl.RELATIONSHIP: return (EObject)createRelationship();
- case ConfigPackageImpl.RESULT_DESCRIPTOR: return (EObject)createResultDescriptor();
- case ConfigPackageImpl.TABLE: return (EObject)createTable();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Column createColumn()
- {
- ColumnImpl column = new ColumnImpl();
- return column;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Command createCommand()
- {
- CommandImpl command = new CommandImpl();
- return command;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Config createConfig()
- {
- ConfigImpl config = new ConfigImpl();
- return config;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConnectionProperties createConnectionProperties()
- {
- ConnectionPropertiesImpl connectionProperties = new ConnectionPropertiesImpl();
- return connectionProperties;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public KeyPair createKeyPair()
- {
- KeyPairImpl keyPair = new KeyPairImpl();
- return keyPair;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Parameter createParameter()
- {
- ParameterImpl parameter = new ParameterImpl();
- return parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Relationship createRelationship()
- {
- RelationshipImpl relationship = new RelationshipImpl();
- return relationship;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResultDescriptor createResultDescriptor()
- {
- ResultDescriptorImpl resultDescriptor = new ResultDescriptorImpl();
- return resultDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Table createTable()
- {
- TableImpl table = new TableImpl();
- return table;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConfigPackageImpl getConfigPackageImpl()
- {
- return (ConfigPackageImpl)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static ConfigPackageImpl getPackage()
- {
- return ConfigPackageImpl.eINSTANCE;
- }
-
-} //ConfigFactoryImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigImpl.java
deleted file mode 100644
index 67e1e5f8a7..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.Command;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.Table;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl#getCommand <em>Command</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl#getConnectionProperties <em>Connection Properties</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl#getTable <em>Table</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl#getRelationship <em>Relationship</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl#getUri <em>Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConfigImpl extends DataObjectImpl implements Config
-{
- /**
- * The cached value of the '{@link #getCommand() <em>Command</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCommand()
- * @generated
- * @ordered
- */
- protected EList command = null;
-
- /**
- * The cached value of the '{@link #getConnectionProperties() <em>Connection Properties</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConnectionProperties()
- * @generated
- * @ordered
- */
- protected ConnectionProperties connectionProperties = null;
-
- /**
- * The cached value of the '{@link #getTable() <em>Table</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTable()
- * @generated
- * @ordered
- */
- protected EList table = null;
-
- /**
- * The cached value of the '{@link #getRelationship() <em>Relationship</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRelationship()
- * @generated
- * @ordered
- */
- protected EList relationship = null;
-
- /**
- * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUri()
- * @generated
- * @ordered
- */
- protected static final String URI_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUri()
- * @generated
- * @ordered
- */
- protected String uri = URI_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConfigImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.CONFIG;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getCommand()
- {
- if (command == null)
- {
- command = new EObjectContainmentEList(Command.class, this, ConfigPackageImpl.CONFIG__COMMAND);
- }
- return command;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConnectionProperties getConnectionProperties()
- {
- return connectionProperties;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetConnectionProperties(ConnectionProperties newConnectionProperties, NotificationChain msgs)
- {
- ConnectionProperties oldConnectionProperties = connectionProperties;
- connectionProperties = newConnectionProperties;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES, oldConnectionProperties, newConnectionProperties);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConnectionProperties(ConnectionProperties newConnectionProperties)
- {
- if (newConnectionProperties != connectionProperties)
- {
- NotificationChain msgs = null;
- if (connectionProperties != null)
- msgs = ((InternalEObject)connectionProperties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES, null, msgs);
- if (newConnectionProperties != null)
- msgs = ((InternalEObject)newConnectionProperties).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES, null, msgs);
- msgs = basicSetConnectionProperties(newConnectionProperties, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES, newConnectionProperties, newConnectionProperties));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getTable()
- {
- if (table == null)
- {
- table = new EObjectContainmentEList(Table.class, this, ConfigPackageImpl.CONFIG__TABLE);
- }
- return table;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getRelationship()
- {
- if (relationship == null)
- {
- relationship = new EObjectContainmentEList(Relationship.class, this, ConfigPackageImpl.CONFIG__RELATIONSHIP);
- }
- return relationship;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getUri()
- {
- return uri;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUri(String newUri)
- {
- String oldUri = uri;
- uri = newUri;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONFIG__URI, oldUri, uri));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONFIG__COMMAND:
- return ((InternalEList)getCommand()).basicRemove(otherEnd, msgs);
- case ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES:
- return basicSetConnectionProperties(null, msgs);
- case ConfigPackageImpl.CONFIG__TABLE:
- return ((InternalEList)getTable()).basicRemove(otherEnd, msgs);
- case ConfigPackageImpl.CONFIG__RELATIONSHIP:
- return ((InternalEList)getRelationship()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONFIG__COMMAND:
- return getCommand();
- case ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES:
- return getConnectionProperties();
- case ConfigPackageImpl.CONFIG__TABLE:
- return getTable();
- case ConfigPackageImpl.CONFIG__RELATIONSHIP:
- return getRelationship();
- case ConfigPackageImpl.CONFIG__URI:
- return getUri();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONFIG__COMMAND:
- getCommand().clear();
- getCommand().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES:
- setConnectionProperties((ConnectionProperties)newValue);
- return;
- case ConfigPackageImpl.CONFIG__TABLE:
- getTable().clear();
- getTable().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.CONFIG__RELATIONSHIP:
- getRelationship().clear();
- getRelationship().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.CONFIG__URI:
- setUri((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONFIG__COMMAND:
- getCommand().clear();
- return;
- case ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES:
- setConnectionProperties((ConnectionProperties)null);
- return;
- case ConfigPackageImpl.CONFIG__TABLE:
- getTable().clear();
- return;
- case ConfigPackageImpl.CONFIG__RELATIONSHIP:
- getRelationship().clear();
- return;
- case ConfigPackageImpl.CONFIG__URI:
- setUri(URI_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONFIG__COMMAND:
- return command != null && !command.isEmpty();
- case ConfigPackageImpl.CONFIG__CONNECTION_PROPERTIES:
- return connectionProperties != null;
- case ConfigPackageImpl.CONFIG__TABLE:
- return table != null && !table.isEmpty();
- case ConfigPackageImpl.CONFIG__RELATIONSHIP:
- return relationship != null && !relationship.isEmpty();
- case ConfigPackageImpl.CONFIG__URI:
- return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (uri: ");
- result.append(uri);
- result.append(')');
- return result.toString();
- }
-
-} //ConfigImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigPackageImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigPackageImpl.java
deleted file mode 100644
index e018f00586..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConfigPackageImpl.java
+++ /dev/null
@@ -1,2808 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Command;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConfigFactory;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Parameter;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.ResultDescriptor;
-import org.apache.tuscany.das.rdb.config.Table;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.ConfigFactory
- * @generated
- */
-public class ConfigPackageImpl extends EPackageImpl
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String eNAME = "config";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String eNS_URI = "http:///org.apache.tuscany.das.rdb/config.xsd";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String eNS_PREFIX = "org.apache.tuscany.das.rdb.config";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final ConfigPackageImpl eINSTANCE = org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl <em>Column</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ColumnImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getColumn()
- * @generated
- */
- public static final int COLUMN = 0;
-
- /**
- * The feature id for the '<em><b>Collision</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__COLLISION = 0;
-
- /**
- * The feature id for the '<em><b>Column Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__COLUMN_TYPE = 1;
-
- /**
- * The feature id for the '<em><b>Converter Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__CONVERTER_CLASS_NAME = 2;
-
- /**
- * The feature id for the '<em><b>Generated</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__GENERATED = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__NAME = 4;
-
- /**
- * The feature id for the '<em><b>Primary Key</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__PRIMARY_KEY = 5;
-
- /**
- * The feature id for the '<em><b>Property Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__PROPERTY_NAME = 6;
-
- /**
- * The feature id for the '<em><b>Table</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN__TABLE = 7;
-
- /**
- * The number of structural features of the '<em>Column</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COLUMN_FEATURE_COUNT = 8;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl <em>Command</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.CommandImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getCommand()
- * @generated
- */
- public static final int COMMAND = 1;
-
- /**
- * The feature id for the '<em><b>Parameter</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__PARAMETER = 0;
-
- /**
- * The feature id for the '<em><b>Result Descriptor</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__RESULT_DESCRIPTOR = 1;
-
- /**
- * The feature id for the '<em><b>Config</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__CONFIG = 2;
-
- /**
- * The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__KIND = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__NAME = 4;
-
- /**
- * The feature id for the '<em><b>SQL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND__SQL = 5;
-
- /**
- * The number of structural features of the '<em>Command</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int COMMAND_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl <em>Config</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getConfig()
- * @generated
- */
- public static final int CONFIG = 2;
-
- /**
- * The feature id for the '<em><b>Command</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG__COMMAND = 0;
-
- /**
- * The feature id for the '<em><b>Connection Properties</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG__CONNECTION_PROPERTIES = 1;
-
- /**
- * The feature id for the '<em><b>Table</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG__TABLE = 2;
-
- /**
- * The feature id for the '<em><b>Relationship</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG__RELATIONSHIP = 3;
-
- /**
- * The feature id for the '<em><b>Uri</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG__URI = 4;
-
- /**
- * The number of structural features of the '<em>Config</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONFIG_FEATURE_COUNT = 5;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl <em>Connection Properties</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getConnectionProperties()
- * @generated
- */
- public static final int CONNECTION_PROPERTIES = 3;
-
- /**
- * The feature id for the '<em><b>Config</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__CONFIG = 0;
-
- /**
- * The feature id for the '<em><b>Data Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__DATA_SOURCE = 1;
-
- /**
- * The feature id for the '<em><b>Driver Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__DRIVER_CLASS_NAME = 2;
-
- /**
- * The feature id for the '<em><b>Driver Password</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__DRIVER_PASSWORD = 3;
-
- /**
- * The feature id for the '<em><b>Driver URL</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__DRIVER_URL = 4;
-
- /**
- * The feature id for the '<em><b>Driver User Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES__DRIVER_USER_NAME = 5;
-
- /**
- * The number of structural features of the '<em>Connection Properties</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int CONNECTION_PROPERTIES_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.KeyPairImpl <em>Key Pair</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.KeyPairImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getKeyPair()
- * @generated
- */
- public static final int KEY_PAIR = 4;
-
- /**
- * The feature id for the '<em><b>Foreign Key Column</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int KEY_PAIR__FOREIGN_KEY_COLUMN = 0;
-
- /**
- * The feature id for the '<em><b>Primary Key Column</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int KEY_PAIR__PRIMARY_KEY_COLUMN = 1;
-
- /**
- * The feature id for the '<em><b>Relationship</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int KEY_PAIR__RELATIONSHIP = 2;
-
- /**
- * The number of structural features of the '<em>Key Pair</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int KEY_PAIR_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.ParameterImpl <em>Parameter</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ParameterImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getParameter()
- * @generated
- */
- public static final int PARAMETER = 5;
-
- /**
- * The feature id for the '<em><b>Column Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int PARAMETER__COLUMN_TYPE = 0;
-
- /**
- * The feature id for the '<em><b>Command</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int PARAMETER__COMMAND = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int PARAMETER__NAME = 2;
-
- /**
- * The number of structural features of the '<em>Parameter</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int PARAMETER_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl <em>Relationship</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.RelationshipImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getRelationship()
- * @generated
- */
- public static final int RELATIONSHIP = 6;
-
- /**
- * The feature id for the '<em><b>Key Pair</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__KEY_PAIR = 0;
-
- /**
- * The feature id for the '<em><b>Config</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__CONFIG = 1;
-
- /**
- * The feature id for the '<em><b>Foreign Key Table</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__FOREIGN_KEY_TABLE = 2;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__MANY = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__NAME = 4;
-
- /**
- * The feature id for the '<em><b>Primary Key Table</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP__PRIMARY_KEY_TABLE = 5;
-
- /**
- * The number of structural features of the '<em>Relationship</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RELATIONSHIP_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl <em>Result Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getResultDescriptor()
- * @generated
- */
- public static final int RESULT_DESCRIPTOR = 7;
-
- /**
- * The feature id for the '<em><b>Column Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR__COLUMN_NAME = 0;
-
- /**
- * The feature id for the '<em><b>Column Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR__COLUMN_TYPE = 1;
-
- /**
- * The feature id for the '<em><b>Command</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR__COMMAND = 2;
-
- /**
- * The feature id for the '<em><b>Converter</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR__CONVERTER = 3;
-
- /**
- * The feature id for the '<em><b>Table Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR__TABLE_NAME = 4;
-
- /**
- * The number of structural features of the '<em>Result Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RESULT_DESCRIPTOR_FEATURE_COUNT = 5;
-
- /**
- * The meta object id for the '{@link org.apache.tuscany.das.rdb.config.impl.TableImpl <em>Table</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.TableImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getTable()
- * @generated
- */
- public static final int TABLE = 8;
-
- /**
- * The feature id for the '<em><b>Column</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__COLUMN = 0;
-
- /**
- * The feature id for the '<em><b>Config</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__CONFIG = 1;
-
- /**
- * The feature id for the '<em><b>Create</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__CREATE = 2;
-
- /**
- * The feature id for the '<em><b>Delete</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__DELETE = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__NAME = 4;
-
- /**
- * The feature id for the '<em><b>Property Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__PROPERTY_NAME = 5;
-
- /**
- * The feature id for the '<em><b>Update</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE__UPDATE = 6;
-
- /**
- * The number of structural features of the '<em>Table</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int TABLE_FEATURE_COUNT = 7;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass columnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass commandEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass configEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass connectionPropertiesEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass keyPairEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass parameterEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass relationshipEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass resultDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass tableEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#eNS_URI
- * @see #init()
- * @generated
- */
- private ConfigPackageImpl()
- {
- super(eNS_URI, ((EFactory)ConfigFactory.INSTANCE));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static ConfigPackageImpl init()
- {
- if (isInited) return (ConfigPackageImpl)EPackage.Registry.INSTANCE.getEPackage(ConfigPackageImpl.eNS_URI);
-
- // Obtain or create and register package
- ConfigPackageImpl theConfigPackageImpl = (ConfigPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ConfigPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ConfigPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theConfigPackageImpl.createPackageContents();
-
- // Initialize created meta-data
- theConfigPackageImpl.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theConfigPackageImpl.freeze();
-
- return theConfigPackageImpl;
- }
-
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Column <em>Column</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Column</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column
- * @generated
- */
- public EClass getColumn()
- {
- return columnEClass;
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#isCollision <em>Collision</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Collision</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#isCollision()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_Collision()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#getColumnType <em>Column Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Column Type</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#getColumnType()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_ColumnType()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#getConverterClassName <em>Converter Class Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Converter Class Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#getConverterClassName()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_ConverterClassName()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#isGenerated <em>Generated</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Generated</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#isGenerated()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_Generated()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#getName()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_Name()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#isPrimaryKey <em>Primary Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Primary Key</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#isPrimaryKey()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_PrimaryKey()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#getPropertyName <em>Property Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Property Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#getPropertyName()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_PropertyName()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Column#getTable <em>Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Table</em>'.
- * @see org.apache.tuscany.das.rdb.config.Column#getTable()
- * @see #getColumn()
- * @generated
- */
- public EAttribute getColumn_Table()
- {
- return (EAttribute)columnEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Command <em>Command</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Command</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command
- * @generated
- */
- public EClass getCommand()
- {
- return commandEClass;
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Command#getParameter <em>Parameter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Parameter</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getParameter()
- * @see #getCommand()
- * @generated
- */
- public EReference getCommand_Parameter()
- {
- return (EReference)commandEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Command#getResultDescriptor <em>Result Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Result Descriptor</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getResultDescriptor()
- * @see #getCommand()
- * @generated
- */
- public EReference getCommand_ResultDescriptor()
- {
- return (EReference)commandEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Command#getConfig <em>Config</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getConfig()
- * @see #getCommand()
- * @generated
- */
- public EAttribute getCommand_Config()
- {
- return (EAttribute)commandEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Command#getKind <em>Kind</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Kind</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getKind()
- * @see #getCommand()
- * @generated
- */
- public EAttribute getCommand_Kind()
- {
- return (EAttribute)commandEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Command#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getName()
- * @see #getCommand()
- * @generated
- */
- public EAttribute getCommand_Name()
- {
- return (EAttribute)commandEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Command#getSQL <em>SQL</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>SQL</em>'.
- * @see org.apache.tuscany.das.rdb.config.Command#getSQL()
- * @see #getCommand()
- * @generated
- */
- public EAttribute getCommand_SQL()
- {
- return (EAttribute)commandEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Config <em>Config</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Config</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config
- * @generated
- */
- public EClass getConfig()
- {
- return configEClass;
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Config#getCommand <em>Command</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Command</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config#getCommand()
- * @see #getConfig()
- * @generated
- */
- public EReference getConfig_Command()
- {
- return (EReference)configEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the containment reference '{@link org.apache.tuscany.das.rdb.config.Config#getConnectionProperties <em>Connection Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Connection Properties</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config#getConnectionProperties()
- * @see #getConfig()
- * @generated
- */
- public EReference getConfig_ConnectionProperties()
- {
- return (EReference)configEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Config#getTable <em>Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Table</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config#getTable()
- * @see #getConfig()
- * @generated
- */
- public EReference getConfig_Table()
- {
- return (EReference)configEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Config#getRelationship <em>Relationship</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Relationship</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config#getRelationship()
- * @see #getConfig()
- * @generated
- */
- public EReference getConfig_Relationship()
- {
- return (EReference)configEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Config#getUri <em>Uri</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Uri</em>'.
- * @see org.apache.tuscany.das.rdb.config.Config#getUri()
- * @see #getConfig()
- * @generated
- */
- public EAttribute getConfig_Uri()
- {
- return (EAttribute)configEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties <em>Connection Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Connection Properties</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties
- * @generated
- */
- public EClass getConnectionProperties()
- {
- return connectionPropertiesEClass;
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig <em>Config</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getConfig()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_Config()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDataSource <em>Data Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Data Source</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getDataSource()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_DataSource()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverClassName <em>Driver Class Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Driver Class Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverClassName()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_DriverClassName()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverPassword <em>Driver Password</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Driver Password</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverPassword()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_DriverPassword()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL <em>Driver URL</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Driver URL</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverURL()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_DriverURL()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverUserName <em>Driver User Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Driver User Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.ConnectionProperties#getDriverUserName()
- * @see #getConnectionProperties()
- * @generated
- */
- public EAttribute getConnectionProperties_DriverUserName()
- {
- return (EAttribute)connectionPropertiesEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.KeyPair <em>Key Pair</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Key Pair</em>'.
- * @see org.apache.tuscany.das.rdb.config.KeyPair
- * @generated
- */
- public EClass getKeyPair()
- {
- return keyPairEClass;
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.KeyPair#getForeignKeyColumn <em>Foreign Key Column</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Foreign Key Column</em>'.
- * @see org.apache.tuscany.das.rdb.config.KeyPair#getForeignKeyColumn()
- * @see #getKeyPair()
- * @generated
- */
- public EAttribute getKeyPair_ForeignKeyColumn()
- {
- return (EAttribute)keyPairEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn <em>Primary Key Column</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Primary Key Column</em>'.
- * @see org.apache.tuscany.das.rdb.config.KeyPair#getPrimaryKeyColumn()
- * @see #getKeyPair()
- * @generated
- */
- public EAttribute getKeyPair_PrimaryKeyColumn()
- {
- return (EAttribute)keyPairEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.KeyPair#getRelationship <em>Relationship</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Relationship</em>'.
- * @see org.apache.tuscany.das.rdb.config.KeyPair#getRelationship()
- * @see #getKeyPair()
- * @generated
- */
- public EAttribute getKeyPair_Relationship()
- {
- return (EAttribute)keyPairEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Parameter <em>Parameter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Parameter</em>'.
- * @see org.apache.tuscany.das.rdb.config.Parameter
- * @generated
- */
- public EClass getParameter()
- {
- return parameterEClass;
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Parameter#getColumnType <em>Column Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Column Type</em>'.
- * @see org.apache.tuscany.das.rdb.config.Parameter#getColumnType()
- * @see #getParameter()
- * @generated
- */
- public EAttribute getParameter_ColumnType()
- {
- return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Parameter#getCommand <em>Command</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Command</em>'.
- * @see org.apache.tuscany.das.rdb.config.Parameter#getCommand()
- * @see #getParameter()
- * @generated
- */
- public EAttribute getParameter_Command()
- {
- return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Parameter#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Parameter#getName()
- * @see #getParameter()
- * @generated
- */
- public EAttribute getParameter_Name()
- {
- return (EAttribute)parameterEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Relationship <em>Relationship</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Relationship</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship
- * @generated
- */
- public EClass getRelationship()
- {
- return relationshipEClass;
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Relationship#getKeyPair <em>Key Pair</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Key Pair</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#getKeyPair()
- * @see #getRelationship()
- * @generated
- */
- public EReference getRelationship_KeyPair()
- {
- return (EReference)relationshipEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Relationship#getConfig <em>Config</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#getConfig()
- * @see #getRelationship()
- * @generated
- */
- public EAttribute getRelationship_Config()
- {
- return (EAttribute)relationshipEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Relationship#getForeignKeyTable <em>Foreign Key Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Foreign Key Table</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#getForeignKeyTable()
- * @see #getRelationship()
- * @generated
- */
- public EAttribute getRelationship_ForeignKeyTable()
- {
- return (EAttribute)relationshipEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Relationship#isMany <em>Many</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Many</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#isMany()
- * @see #getRelationship()
- * @generated
- */
- public EAttribute getRelationship_Many()
- {
- return (EAttribute)relationshipEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Relationship#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#getName()
- * @see #getRelationship()
- * @generated
- */
- public EAttribute getRelationship_Name()
- {
- return (EAttribute)relationshipEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Relationship#getPrimaryKeyTable <em>Primary Key Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Primary Key Table</em>'.
- * @see org.apache.tuscany.das.rdb.config.Relationship#getPrimaryKeyTable()
- * @see #getRelationship()
- * @generated
- */
- public EAttribute getRelationship_PrimaryKeyTable()
- {
- return (EAttribute)relationshipEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor <em>Result Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Result Descriptor</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor
- * @generated
- */
- public EClass getResultDescriptor()
- {
- return resultDescriptorEClass;
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnName <em>Column Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Column Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnName()
- * @see #getResultDescriptor()
- * @generated
- */
- public EAttribute getResultDescriptor_ColumnName()
- {
- return (EAttribute)resultDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnType <em>Column Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Column Type</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getColumnType()
- * @see #getResultDescriptor()
- * @generated
- */
- public EAttribute getResultDescriptor_ColumnType()
- {
- return (EAttribute)resultDescriptorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getCommand <em>Command</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Command</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getCommand()
- * @see #getResultDescriptor()
- * @generated
- */
- public EAttribute getResultDescriptor_Command()
- {
- return (EAttribute)resultDescriptorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getConverter <em>Converter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Converter</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getConverter()
- * @see #getResultDescriptor()
- * @generated
- */
- public EAttribute getResultDescriptor_Converter()
- {
- return (EAttribute)resultDescriptorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.ResultDescriptor#getTableName <em>Table Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Table Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.ResultDescriptor#getTableName()
- * @see #getResultDescriptor()
- * @generated
- */
- public EAttribute getResultDescriptor_TableName()
- {
- return (EAttribute)resultDescriptorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.config.Table <em>Table</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Table</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table
- * @generated
- */
- public EClass getTable()
- {
- return tableEClass;
- }
-
- /**
- * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.config.Table#getColumn <em>Column</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Column</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getColumn()
- * @see #getTable()
- * @generated
- */
- public EReference getTable_Column()
- {
- return (EReference)tableEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getConfig <em>Config</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Config</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getConfig()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_Config()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getCreate <em>Create</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Create</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getCreate()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_Create()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getDelete <em>Delete</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Delete</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getDelete()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_Delete()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getName()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_Name()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getPropertyName <em>Property Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Property Name</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getPropertyName()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_PropertyName()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.config.Table#getUpdate <em>Update</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Update</em>'.
- * @see org.apache.tuscany.das.rdb.config.Table#getUpdate()
- * @see #getTable()
- * @generated
- */
- public EAttribute getTable_Update()
- {
- return (EAttribute)tableEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- public ConfigFactory getConfigFactory()
- {
- return (ConfigFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents()
- {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- columnEClass = createEClass(COLUMN);
- createEAttribute(columnEClass, COLUMN__COLLISION);
- createEAttribute(columnEClass, COLUMN__COLUMN_TYPE);
- createEAttribute(columnEClass, COLUMN__CONVERTER_CLASS_NAME);
- createEAttribute(columnEClass, COLUMN__GENERATED);
- createEAttribute(columnEClass, COLUMN__NAME);
- createEAttribute(columnEClass, COLUMN__PRIMARY_KEY);
- createEAttribute(columnEClass, COLUMN__PROPERTY_NAME);
- createEAttribute(columnEClass, COLUMN__TABLE);
-
- commandEClass = createEClass(COMMAND);
- createEReference(commandEClass, COMMAND__PARAMETER);
- createEReference(commandEClass, COMMAND__RESULT_DESCRIPTOR);
- createEAttribute(commandEClass, COMMAND__CONFIG);
- createEAttribute(commandEClass, COMMAND__KIND);
- createEAttribute(commandEClass, COMMAND__NAME);
- createEAttribute(commandEClass, COMMAND__SQL);
-
- configEClass = createEClass(CONFIG);
- createEReference(configEClass, CONFIG__COMMAND);
- createEReference(configEClass, CONFIG__CONNECTION_PROPERTIES);
- createEReference(configEClass, CONFIG__TABLE);
- createEReference(configEClass, CONFIG__RELATIONSHIP);
- createEAttribute(configEClass, CONFIG__URI);
-
- connectionPropertiesEClass = createEClass(CONNECTION_PROPERTIES);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__CONFIG);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__DATA_SOURCE);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__DRIVER_CLASS_NAME);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__DRIVER_PASSWORD);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__DRIVER_URL);
- createEAttribute(connectionPropertiesEClass, CONNECTION_PROPERTIES__DRIVER_USER_NAME);
-
- keyPairEClass = createEClass(KEY_PAIR);
- createEAttribute(keyPairEClass, KEY_PAIR__FOREIGN_KEY_COLUMN);
- createEAttribute(keyPairEClass, KEY_PAIR__PRIMARY_KEY_COLUMN);
- createEAttribute(keyPairEClass, KEY_PAIR__RELATIONSHIP);
-
- parameterEClass = createEClass(PARAMETER);
- createEAttribute(parameterEClass, PARAMETER__COLUMN_TYPE);
- createEAttribute(parameterEClass, PARAMETER__COMMAND);
- createEAttribute(parameterEClass, PARAMETER__NAME);
-
- relationshipEClass = createEClass(RELATIONSHIP);
- createEReference(relationshipEClass, RELATIONSHIP__KEY_PAIR);
- createEAttribute(relationshipEClass, RELATIONSHIP__CONFIG);
- createEAttribute(relationshipEClass, RELATIONSHIP__FOREIGN_KEY_TABLE);
- createEAttribute(relationshipEClass, RELATIONSHIP__MANY);
- createEAttribute(relationshipEClass, RELATIONSHIP__NAME);
- createEAttribute(relationshipEClass, RELATIONSHIP__PRIMARY_KEY_TABLE);
-
- resultDescriptorEClass = createEClass(RESULT_DESCRIPTOR);
- createEAttribute(resultDescriptorEClass, RESULT_DESCRIPTOR__COLUMN_NAME);
- createEAttribute(resultDescriptorEClass, RESULT_DESCRIPTOR__COLUMN_TYPE);
- createEAttribute(resultDescriptorEClass, RESULT_DESCRIPTOR__COMMAND);
- createEAttribute(resultDescriptorEClass, RESULT_DESCRIPTOR__CONVERTER);
- createEAttribute(resultDescriptorEClass, RESULT_DESCRIPTOR__TABLE_NAME);
-
- tableEClass = createEClass(TABLE);
- createEReference(tableEClass, TABLE__COLUMN);
- createEAttribute(tableEClass, TABLE__CONFIG);
- createEAttribute(tableEClass, TABLE__CREATE);
- createEAttribute(tableEClass, TABLE__DELETE);
- createEAttribute(tableEClass, TABLE__NAME);
- createEAttribute(tableEClass, TABLE__PROPERTY_NAME);
- createEAttribute(tableEClass, TABLE__UPDATE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents()
- {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(columnEClass, Column.class, "Column", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getColumn_Collision(), theXMLTypePackage.getBoolean(), "collision", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_ColumnType(), theXMLTypePackage.getString(), "columnType", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_ConverterClassName(), theXMLTypePackage.getString(), "converterClassName", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_Generated(), theXMLTypePackage.getBoolean(), "generated", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_PrimaryKey(), theXMLTypePackage.getBoolean(), "primaryKey", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_PropertyName(), theXMLTypePackage.getString(), "propertyName", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getColumn_Table(), theXMLTypePackage.getAnyURI(), "table", null, 0, 1, Column.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(commandEClass, Command.class, "Command", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCommand_Parameter(), this.getParameter(), null, "parameter", null, 0, -1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCommand_ResultDescriptor(), this.getResultDescriptor(), null, "resultDescriptor", null, 0, -1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCommand_Config(), theXMLTypePackage.getAnyURI(), "config", null, 0, 1, Command.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCommand_Kind(), theXMLTypePackage.getString(), "kind", null, 0, 1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCommand_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCommand_SQL(), theXMLTypePackage.getString(), "sQL", null, 0, 1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(configEClass, Config.class, "Config", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getConfig_Command(), this.getCommand(), null, "command", null, 0, -1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getConfig_ConnectionProperties(), this.getConnectionProperties(), null, "connectionProperties", null, 0, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getConfig_Table(), this.getTable(), null, "table", null, 0, -1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getConfig_Relationship(), this.getRelationship(), null, "relationship", null, 0, -1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConfig_Uri(), theXMLTypePackage.getString(), "uri", null, 0, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(connectionPropertiesEClass, ConnectionProperties.class, "ConnectionProperties", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getConnectionProperties_Config(), theXMLTypePackage.getAnyURI(), "config", null, 0, 1, ConnectionProperties.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConnectionProperties_DataSource(), theXMLTypePackage.getString(), "dataSource", null, 0, 1, ConnectionProperties.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConnectionProperties_DriverClassName(), theXMLTypePackage.getString(), "driverClassName", null, 0, 1, ConnectionProperties.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConnectionProperties_DriverPassword(), theXMLTypePackage.getString(), "driverPassword", null, 0, 1, ConnectionProperties.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConnectionProperties_DriverURL(), theXMLTypePackage.getString(), "driverURL", null, 0, 1, ConnectionProperties.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getConnectionProperties_DriverUserName(), theXMLTypePackage.getString(), "driverUserName", null, 0, 1, ConnectionProperties.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(keyPairEClass, KeyPair.class, "KeyPair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getKeyPair_ForeignKeyColumn(), theXMLTypePackage.getString(), "foreignKeyColumn", null, 0, 1, KeyPair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getKeyPair_PrimaryKeyColumn(), theXMLTypePackage.getString(), "primaryKeyColumn", null, 0, 1, KeyPair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getKeyPair_Relationship(), theXMLTypePackage.getAnyURI(), "relationship", null, 0, 1, KeyPair.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getParameter_ColumnType(), theXMLTypePackage.getString(), "columnType", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getParameter_Command(), theXMLTypePackage.getAnyURI(), "command", null, 0, 1, Parameter.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getParameter_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(relationshipEClass, Relationship.class, "Relationship", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getRelationship_KeyPair(), this.getKeyPair(), null, "keyPair", null, 0, -1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRelationship_Config(), theXMLTypePackage.getAnyURI(), "config", null, 0, 1, Relationship.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRelationship_ForeignKeyTable(), theXMLTypePackage.getString(), "foreignKeyTable", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRelationship_Many(), theXMLTypePackage.getBoolean(), "many", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRelationship_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getRelationship_PrimaryKeyTable(), theXMLTypePackage.getString(), "primaryKeyTable", null, 0, 1, Relationship.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(resultDescriptorEClass, ResultDescriptor.class, "ResultDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getResultDescriptor_ColumnName(), theXMLTypePackage.getString(), "columnName", null, 0, 1, ResultDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getResultDescriptor_ColumnType(), theXMLTypePackage.getString(), "columnType", null, 0, 1, ResultDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getResultDescriptor_Command(), theXMLTypePackage.getAnyURI(), "command", null, 0, 1, ResultDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getResultDescriptor_Converter(), theXMLTypePackage.getString(), "converter", null, 0, 1, ResultDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getResultDescriptor_TableName(), theXMLTypePackage.getString(), "tableName", null, 0, 1, ResultDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getTable_Column(), this.getColumn(), null, "column", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_Config(), theXMLTypePackage.getAnyURI(), "config", null, 0, 1, Table.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_Create(), theXMLTypePackage.getString(), "create", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_Delete(), theXMLTypePackage.getString(), "delete", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_PropertyName(), theXMLTypePackage.getString(), "propertyName", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTable_Update(), theXMLTypePackage.getString(), "update", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations()
- {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
- addAnnotation
- (columnEClass,
- source,
- new String[]
- {
- "name", "Column",
- "kind", "empty"
- });
- addAnnotation
- (getColumn_Collision(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "collision"
- });
- addAnnotation
- (getColumn_ColumnType(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "columnType"
- });
- addAnnotation
- (getColumn_ConverterClassName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "converterClassName"
- });
- addAnnotation
- (getColumn_Generated(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "generated"
- });
- addAnnotation
- (getColumn_Name(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "name"
- });
- addAnnotation
- (getColumn_PrimaryKey(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "primaryKey"
- });
- addAnnotation
- (getColumn_PropertyName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "propertyName"
- });
- addAnnotation
- (getColumn_Table(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Table"
- });
- addAnnotation
- (commandEClass,
- source,
- new String[]
- {
- "name", "Command",
- "kind", "elementOnly"
- });
- addAnnotation
- (getCommand_Parameter(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "Parameter"
- });
- addAnnotation
- (getCommand_ResultDescriptor(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "ResultDescriptor"
- });
- addAnnotation
- (getCommand_Config(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Config"
- });
- addAnnotation
- (getCommand_Kind(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "kind"
- });
- addAnnotation
- (getCommand_Name(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "name"
- });
- addAnnotation
- (getCommand_SQL(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "SQL"
- });
- addAnnotation
- (configEClass,
- source,
- new String[]
- {
- "name", "Config",
- "kind", "elementOnly"
- });
- addAnnotation
- (getConfig_Command(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "Command"
- });
- addAnnotation
- (getConfig_ConnectionProperties(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "ConnectionProperties"
- });
- addAnnotation
- (getConfig_Table(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "Table"
- });
- addAnnotation
- (getConfig_Relationship(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "Relationship"
- });
- addAnnotation
- (getConfig_Uri(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "uri"
- });
- addAnnotation
- (connectionPropertiesEClass,
- source,
- new String[]
- {
- "name", "ConnectionProperties",
- "kind", "empty"
- });
- addAnnotation
- (getConnectionProperties_Config(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Config"
- });
- addAnnotation
- (getConnectionProperties_DataSource(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "dataSource"
- });
- addAnnotation
- (getConnectionProperties_DriverClassName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "driverClassName"
- });
- addAnnotation
- (getConnectionProperties_DriverPassword(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "driverPassword"
- });
- addAnnotation
- (getConnectionProperties_DriverURL(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "driverURL"
- });
- addAnnotation
- (getConnectionProperties_DriverUserName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "driverUserName"
- });
- addAnnotation
- (keyPairEClass,
- source,
- new String[]
- {
- "name", "KeyPair",
- "kind", "empty"
- });
- addAnnotation
- (getKeyPair_ForeignKeyColumn(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "foreignKeyColumn"
- });
- addAnnotation
- (getKeyPair_PrimaryKeyColumn(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "primaryKeyColumn"
- });
- addAnnotation
- (getKeyPair_Relationship(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Relationship"
- });
- addAnnotation
- (parameterEClass,
- source,
- new String[]
- {
- "name", "Parameter",
- "kind", "empty"
- });
- addAnnotation
- (getParameter_ColumnType(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "columnType"
- });
- addAnnotation
- (getParameter_Command(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Command"
- });
- addAnnotation
- (getParameter_Name(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "name"
- });
- addAnnotation
- (relationshipEClass,
- source,
- new String[]
- {
- "name", "Relationship",
- "kind", "elementOnly"
- });
- addAnnotation
- (getRelationship_KeyPair(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "KeyPair"
- });
- addAnnotation
- (getRelationship_Config(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Config"
- });
- addAnnotation
- (getRelationship_ForeignKeyTable(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "foreignKeyTable"
- });
- addAnnotation
- (getRelationship_Many(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "many"
- });
- addAnnotation
- (getRelationship_Name(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "name"
- });
- addAnnotation
- (getRelationship_PrimaryKeyTable(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "primaryKeyTable"
- });
- addAnnotation
- (resultDescriptorEClass,
- source,
- new String[]
- {
- "name", "ResultDescriptor",
- "kind", "empty"
- });
- addAnnotation
- (getResultDescriptor_ColumnName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "columnName"
- });
- addAnnotation
- (getResultDescriptor_ColumnType(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "columnType"
- });
- addAnnotation
- (getResultDescriptor_Command(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Command"
- });
- addAnnotation
- (getResultDescriptor_Converter(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "converter"
- });
- addAnnotation
- (getResultDescriptor_TableName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "tableName"
- });
- addAnnotation
- (tableEClass,
- source,
- new String[]
- {
- "name", "Table",
- "kind", "elementOnly"
- });
- addAnnotation
- (getTable_Column(),
- source,
- new String[]
- {
- "kind", "element",
- "name", "Column"
- });
- addAnnotation
- (getTable_Config(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "Config"
- });
- addAnnotation
- (getTable_Create(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "create"
- });
- addAnnotation
- (getTable_Delete(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "delete"
- });
- addAnnotation
- (getTable_Name(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "name"
- });
- addAnnotation
- (getTable_PropertyName(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "propertyName"
- });
- addAnnotation
- (getTable_Update(),
- source,
- new String[]
- {
- "kind", "attribute",
- "name", "update"
- });
- }
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- public interface Literals
- {
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.ColumnImpl <em>Column</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ColumnImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getColumn()
- * @generated
- */
- public static final EClass COLUMN = eINSTANCE.getColumn();
-
- /**
- * The meta object literal for the '<em><b>Collision</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__COLLISION = eINSTANCE.getColumn_Collision();
-
- /**
- * The meta object literal for the '<em><b>Column Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__COLUMN_TYPE = eINSTANCE.getColumn_ColumnType();
-
- /**
- * The meta object literal for the '<em><b>Converter Class Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__CONVERTER_CLASS_NAME = eINSTANCE.getColumn_ConverterClassName();
-
- /**
- * The meta object literal for the '<em><b>Generated</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__GENERATED = eINSTANCE.getColumn_Generated();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__NAME = eINSTANCE.getColumn_Name();
-
- /**
- * The meta object literal for the '<em><b>Primary Key</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__PRIMARY_KEY = eINSTANCE.getColumn_PrimaryKey();
-
- /**
- * The meta object literal for the '<em><b>Property Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__PROPERTY_NAME = eINSTANCE.getColumn_PropertyName();
-
- /**
- * The meta object literal for the '<em><b>Table</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COLUMN__TABLE = eINSTANCE.getColumn_Table();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.CommandImpl <em>Command</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.CommandImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getCommand()
- * @generated
- */
- public static final EClass COMMAND = eINSTANCE.getCommand();
-
- /**
- * The meta object literal for the '<em><b>Parameter</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference COMMAND__PARAMETER = eINSTANCE.getCommand_Parameter();
-
- /**
- * The meta object literal for the '<em><b>Result Descriptor</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference COMMAND__RESULT_DESCRIPTOR = eINSTANCE.getCommand_ResultDescriptor();
-
- /**
- * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COMMAND__CONFIG = eINSTANCE.getCommand_Config();
-
- /**
- * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COMMAND__KIND = eINSTANCE.getCommand_Kind();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COMMAND__NAME = eINSTANCE.getCommand_Name();
-
- /**
- * The meta object literal for the '<em><b>SQL</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute COMMAND__SQL = eINSTANCE.getCommand_SQL();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.ConfigImpl <em>Config</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getConfig()
- * @generated
- */
- public static final EClass CONFIG = eINSTANCE.getConfig();
-
- /**
- * The meta object literal for the '<em><b>Command</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference CONFIG__COMMAND = eINSTANCE.getConfig_Command();
-
- /**
- * The meta object literal for the '<em><b>Connection Properties</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference CONFIG__CONNECTION_PROPERTIES = eINSTANCE.getConfig_ConnectionProperties();
-
- /**
- * The meta object literal for the '<em><b>Table</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference CONFIG__TABLE = eINSTANCE.getConfig_Table();
-
- /**
- * The meta object literal for the '<em><b>Relationship</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference CONFIG__RELATIONSHIP = eINSTANCE.getConfig_Relationship();
-
- /**
- * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONFIG__URI = eINSTANCE.getConfig_Uri();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl <em>Connection Properties</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getConnectionProperties()
- * @generated
- */
- public static final EClass CONNECTION_PROPERTIES = eINSTANCE.getConnectionProperties();
-
- /**
- * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__CONFIG = eINSTANCE.getConnectionProperties_Config();
-
- /**
- * The meta object literal for the '<em><b>Data Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__DATA_SOURCE = eINSTANCE.getConnectionProperties_DataSource();
-
- /**
- * The meta object literal for the '<em><b>Driver Class Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__DRIVER_CLASS_NAME = eINSTANCE.getConnectionProperties_DriverClassName();
-
- /**
- * The meta object literal for the '<em><b>Driver Password</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__DRIVER_PASSWORD = eINSTANCE.getConnectionProperties_DriverPassword();
-
- /**
- * The meta object literal for the '<em><b>Driver URL</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__DRIVER_URL = eINSTANCE.getConnectionProperties_DriverURL();
-
- /**
- * The meta object literal for the '<em><b>Driver User Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute CONNECTION_PROPERTIES__DRIVER_USER_NAME = eINSTANCE.getConnectionProperties_DriverUserName();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.KeyPairImpl <em>Key Pair</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.KeyPairImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getKeyPair()
- * @generated
- */
- public static final EClass KEY_PAIR = eINSTANCE.getKeyPair();
-
- /**
- * The meta object literal for the '<em><b>Foreign Key Column</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute KEY_PAIR__FOREIGN_KEY_COLUMN = eINSTANCE.getKeyPair_ForeignKeyColumn();
-
- /**
- * The meta object literal for the '<em><b>Primary Key Column</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute KEY_PAIR__PRIMARY_KEY_COLUMN = eINSTANCE.getKeyPair_PrimaryKeyColumn();
-
- /**
- * The meta object literal for the '<em><b>Relationship</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute KEY_PAIR__RELATIONSHIP = eINSTANCE.getKeyPair_Relationship();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.ParameterImpl <em>Parameter</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ParameterImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getParameter()
- * @generated
- */
- public static final EClass PARAMETER = eINSTANCE.getParameter();
-
- /**
- * The meta object literal for the '<em><b>Column Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute PARAMETER__COLUMN_TYPE = eINSTANCE.getParameter_ColumnType();
-
- /**
- * The meta object literal for the '<em><b>Command</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute PARAMETER__COMMAND = eINSTANCE.getParameter_Command();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl <em>Relationship</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.RelationshipImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getRelationship()
- * @generated
- */
- public static final EClass RELATIONSHIP = eINSTANCE.getRelationship();
-
- /**
- * The meta object literal for the '<em><b>Key Pair</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference RELATIONSHIP__KEY_PAIR = eINSTANCE.getRelationship_KeyPair();
-
- /**
- * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RELATIONSHIP__CONFIG = eINSTANCE.getRelationship_Config();
-
- /**
- * The meta object literal for the '<em><b>Foreign Key Table</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RELATIONSHIP__FOREIGN_KEY_TABLE = eINSTANCE.getRelationship_ForeignKeyTable();
-
- /**
- * The meta object literal for the '<em><b>Many</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RELATIONSHIP__MANY = eINSTANCE.getRelationship_Many();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RELATIONSHIP__NAME = eINSTANCE.getRelationship_Name();
-
- /**
- * The meta object literal for the '<em><b>Primary Key Table</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RELATIONSHIP__PRIMARY_KEY_TABLE = eINSTANCE.getRelationship_PrimaryKeyTable();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl <em>Result Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getResultDescriptor()
- * @generated
- */
- public static final EClass RESULT_DESCRIPTOR = eINSTANCE.getResultDescriptor();
-
- /**
- * The meta object literal for the '<em><b>Column Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RESULT_DESCRIPTOR__COLUMN_NAME = eINSTANCE.getResultDescriptor_ColumnName();
-
- /**
- * The meta object literal for the '<em><b>Column Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RESULT_DESCRIPTOR__COLUMN_TYPE = eINSTANCE.getResultDescriptor_ColumnType();
-
- /**
- * The meta object literal for the '<em><b>Command</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RESULT_DESCRIPTOR__COMMAND = eINSTANCE.getResultDescriptor_Command();
-
- /**
- * The meta object literal for the '<em><b>Converter</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RESULT_DESCRIPTOR__CONVERTER = eINSTANCE.getResultDescriptor_Converter();
-
- /**
- * The meta object literal for the '<em><b>Table Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RESULT_DESCRIPTOR__TABLE_NAME = eINSTANCE.getResultDescriptor_TableName();
-
- /**
- * The meta object literal for the '{@link org.apache.tuscany.das.rdb.config.impl.TableImpl <em>Table</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.das.rdb.config.impl.TableImpl
- * @see org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl#getTable()
- * @generated
- */
- public static final EClass TABLE = eINSTANCE.getTable();
-
- /**
- * The meta object literal for the '<em><b>Column</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference TABLE__COLUMN = eINSTANCE.getTable_Column();
-
- /**
- * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__CONFIG = eINSTANCE.getTable_Config();
-
- /**
- * The meta object literal for the '<em><b>Create</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__CREATE = eINSTANCE.getTable_Create();
-
- /**
- * The meta object literal for the '<em><b>Delete</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__DELETE = eINSTANCE.getTable_Delete();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__NAME = eINSTANCE.getTable_Name();
-
- /**
- * The meta object literal for the '<em><b>Property Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__PROPERTY_NAME = eINSTANCE.getTable_PropertyName();
-
- /**
- * The meta object literal for the '<em><b>Update</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute TABLE__UPDATE = eINSTANCE.getTable_Update();
-
- }
-
-} //ConfigPackageImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConnectionPropertiesImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConnectionPropertiesImpl.java
deleted file mode 100644
index c961732dca..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ConnectionPropertiesImpl.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connection Properties</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getDataSource <em>Data Source</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getDriverClassName <em>Driver Class Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getDriverPassword <em>Driver Password</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getDriverURL <em>Driver URL</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ConnectionPropertiesImpl#getDriverUserName <em>Driver User Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConnectionPropertiesImpl extends DataObjectImpl implements ConnectionProperties
-{
- /**
- * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected String config = CONFIG_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDataSource() <em>Data Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDataSource()
- * @generated
- * @ordered
- */
- protected static final String DATA_SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDataSource() <em>Data Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDataSource()
- * @generated
- * @ordered
- */
- protected String dataSource = DATA_SOURCE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDriverClassName() <em>Driver Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverClassName()
- * @generated
- * @ordered
- */
- protected static final String DRIVER_CLASS_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDriverClassName() <em>Driver Class Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverClassName()
- * @generated
- * @ordered
- */
- protected String driverClassName = DRIVER_CLASS_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDriverPassword() <em>Driver Password</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverPassword()
- * @generated
- * @ordered
- */
- protected static final String DRIVER_PASSWORD_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDriverPassword() <em>Driver Password</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverPassword()
- * @generated
- * @ordered
- */
- protected String driverPassword = DRIVER_PASSWORD_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDriverURL() <em>Driver URL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverURL()
- * @generated
- * @ordered
- */
- protected static final String DRIVER_URL_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDriverURL() <em>Driver URL</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverURL()
- * @generated
- * @ordered
- */
- protected String driverURL = DRIVER_URL_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDriverUserName() <em>Driver User Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverUserName()
- * @generated
- * @ordered
- */
- protected static final String DRIVER_USER_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDriverUserName() <em>Driver User Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDriverUserName()
- * @generated
- * @ordered
- */
- protected String driverUserName = DRIVER_USER_NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConnectionPropertiesImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.CONNECTION_PROPERTIES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfig()
- {
- return config;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfig(String newConfig)
- {
- String oldConfig = config;
- config = newConfig;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__CONFIG, oldConfig, config));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDataSource()
- {
- return dataSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDataSource(String newDataSource)
- {
- String oldDataSource = dataSource;
- dataSource = newDataSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__DATA_SOURCE, oldDataSource, dataSource));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDriverClassName()
- {
- return driverClassName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDriverClassName(String newDriverClassName)
- {
- String oldDriverClassName = driverClassName;
- driverClassName = newDriverClassName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_CLASS_NAME, oldDriverClassName, driverClassName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDriverPassword()
- {
- return driverPassword;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDriverPassword(String newDriverPassword)
- {
- String oldDriverPassword = driverPassword;
- driverPassword = newDriverPassword;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_PASSWORD, oldDriverPassword, driverPassword));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDriverURL()
- {
- return driverURL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDriverURL(String newDriverURL)
- {
- String oldDriverURL = driverURL;
- driverURL = newDriverURL;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_URL, oldDriverURL, driverURL));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDriverUserName()
- {
- return driverUserName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDriverUserName(String newDriverUserName)
- {
- String oldDriverUserName = driverUserName;
- driverUserName = newDriverUserName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_USER_NAME, oldDriverUserName, driverUserName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONNECTION_PROPERTIES__CONFIG:
- return getConfig();
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DATA_SOURCE:
- return getDataSource();
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_CLASS_NAME:
- return getDriverClassName();
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_PASSWORD:
- return getDriverPassword();
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_URL:
- return getDriverURL();
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_USER_NAME:
- return getDriverUserName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONNECTION_PROPERTIES__CONFIG:
- setConfig((String)newValue);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DATA_SOURCE:
- setDataSource((String)newValue);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_CLASS_NAME:
- setDriverClassName((String)newValue);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_PASSWORD:
- setDriverPassword((String)newValue);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_URL:
- setDriverURL((String)newValue);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_USER_NAME:
- setDriverUserName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONNECTION_PROPERTIES__CONFIG:
- setConfig(CONFIG_EDEFAULT);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DATA_SOURCE:
- setDataSource(DATA_SOURCE_EDEFAULT);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_CLASS_NAME:
- setDriverClassName(DRIVER_CLASS_NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_PASSWORD:
- setDriverPassword(DRIVER_PASSWORD_EDEFAULT);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_URL:
- setDriverURL(DRIVER_URL_EDEFAULT);
- return;
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_USER_NAME:
- setDriverUserName(DRIVER_USER_NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.CONNECTION_PROPERTIES__CONFIG:
- return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DATA_SOURCE:
- return DATA_SOURCE_EDEFAULT == null ? dataSource != null : !DATA_SOURCE_EDEFAULT.equals(dataSource);
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_CLASS_NAME:
- return DRIVER_CLASS_NAME_EDEFAULT == null ? driverClassName != null : !DRIVER_CLASS_NAME_EDEFAULT.equals(driverClassName);
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_PASSWORD:
- return DRIVER_PASSWORD_EDEFAULT == null ? driverPassword != null : !DRIVER_PASSWORD_EDEFAULT.equals(driverPassword);
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_URL:
- return DRIVER_URL_EDEFAULT == null ? driverURL != null : !DRIVER_URL_EDEFAULT.equals(driverURL);
- case ConfigPackageImpl.CONNECTION_PROPERTIES__DRIVER_USER_NAME:
- return DRIVER_USER_NAME_EDEFAULT == null ? driverUserName != null : !DRIVER_USER_NAME_EDEFAULT.equals(driverUserName);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (config: ");
- result.append(config);
- result.append(", dataSource: ");
- result.append(dataSource);
- result.append(", driverClassName: ");
- result.append(driverClassName);
- result.append(", driverPassword: ");
- result.append(driverPassword);
- result.append(", driverURL: ");
- result.append(driverURL);
- result.append(", driverUserName: ");
- result.append(driverUserName);
- result.append(')');
- return result.toString();
- }
-
-} //ConnectionPropertiesImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/KeyPairImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/KeyPairImpl.java
deleted file mode 100644
index f12c7a3ec1..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/KeyPairImpl.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.KeyPair;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Key Pair</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.KeyPairImpl#getForeignKeyColumn <em>Foreign Key Column</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.KeyPairImpl#getPrimaryKeyColumn <em>Primary Key Column</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.KeyPairImpl#getRelationship <em>Relationship</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class KeyPairImpl extends DataObjectImpl implements KeyPair
-{
- /**
- * The default value of the '{@link #getForeignKeyColumn() <em>Foreign Key Column</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getForeignKeyColumn()
- * @generated
- * @ordered
- */
- protected static final String FOREIGN_KEY_COLUMN_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getForeignKeyColumn() <em>Foreign Key Column</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getForeignKeyColumn()
- * @generated
- * @ordered
- */
- protected String foreignKeyColumn = FOREIGN_KEY_COLUMN_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPrimaryKeyColumn() <em>Primary Key Column</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKeyColumn()
- * @generated
- * @ordered
- */
- protected static final String PRIMARY_KEY_COLUMN_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPrimaryKeyColumn() <em>Primary Key Column</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKeyColumn()
- * @generated
- * @ordered
- */
- protected String primaryKeyColumn = PRIMARY_KEY_COLUMN_EDEFAULT;
-
- /**
- * The default value of the '{@link #getRelationship() <em>Relationship</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRelationship()
- * @generated
- * @ordered
- */
- protected static final String RELATIONSHIP_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getRelationship() <em>Relationship</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRelationship()
- * @generated
- * @ordered
- */
- protected String relationship = RELATIONSHIP_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected KeyPairImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.KEY_PAIR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getForeignKeyColumn()
- {
- return foreignKeyColumn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setForeignKeyColumn(String newForeignKeyColumn)
- {
- String oldForeignKeyColumn = foreignKeyColumn;
- foreignKeyColumn = newForeignKeyColumn;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.KEY_PAIR__FOREIGN_KEY_COLUMN, oldForeignKeyColumn, foreignKeyColumn));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPrimaryKeyColumn()
- {
- return primaryKeyColumn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPrimaryKeyColumn(String newPrimaryKeyColumn)
- {
- String oldPrimaryKeyColumn = primaryKeyColumn;
- primaryKeyColumn = newPrimaryKeyColumn;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.KEY_PAIR__PRIMARY_KEY_COLUMN, oldPrimaryKeyColumn, primaryKeyColumn));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getRelationship()
- {
- return relationship;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRelationship(String newRelationship)
- {
- String oldRelationship = relationship;
- relationship = newRelationship;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.KEY_PAIR__RELATIONSHIP, oldRelationship, relationship));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.KEY_PAIR__FOREIGN_KEY_COLUMN:
- return getForeignKeyColumn();
- case ConfigPackageImpl.KEY_PAIR__PRIMARY_KEY_COLUMN:
- return getPrimaryKeyColumn();
- case ConfigPackageImpl.KEY_PAIR__RELATIONSHIP:
- return getRelationship();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.KEY_PAIR__FOREIGN_KEY_COLUMN:
- setForeignKeyColumn((String)newValue);
- return;
- case ConfigPackageImpl.KEY_PAIR__PRIMARY_KEY_COLUMN:
- setPrimaryKeyColumn((String)newValue);
- return;
- case ConfigPackageImpl.KEY_PAIR__RELATIONSHIP:
- setRelationship((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.KEY_PAIR__FOREIGN_KEY_COLUMN:
- setForeignKeyColumn(FOREIGN_KEY_COLUMN_EDEFAULT);
- return;
- case ConfigPackageImpl.KEY_PAIR__PRIMARY_KEY_COLUMN:
- setPrimaryKeyColumn(PRIMARY_KEY_COLUMN_EDEFAULT);
- return;
- case ConfigPackageImpl.KEY_PAIR__RELATIONSHIP:
- setRelationship(RELATIONSHIP_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.KEY_PAIR__FOREIGN_KEY_COLUMN:
- return FOREIGN_KEY_COLUMN_EDEFAULT == null ? foreignKeyColumn != null : !FOREIGN_KEY_COLUMN_EDEFAULT.equals(foreignKeyColumn);
- case ConfigPackageImpl.KEY_PAIR__PRIMARY_KEY_COLUMN:
- return PRIMARY_KEY_COLUMN_EDEFAULT == null ? primaryKeyColumn != null : !PRIMARY_KEY_COLUMN_EDEFAULT.equals(primaryKeyColumn);
- case ConfigPackageImpl.KEY_PAIR__RELATIONSHIP:
- return RELATIONSHIP_EDEFAULT == null ? relationship != null : !RELATIONSHIP_EDEFAULT.equals(relationship);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (foreignKeyColumn: ");
- result.append(foreignKeyColumn);
- result.append(", primaryKeyColumn: ");
- result.append(primaryKeyColumn);
- result.append(", relationship: ");
- result.append(relationship);
- result.append(')');
- return result.toString();
- }
-
-} //KeyPairImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ParameterImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ParameterImpl.java
deleted file mode 100644
index ef4b7e58a5..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ParameterImpl.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.Parameter;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ParameterImpl#getColumnType <em>Column Type</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ParameterImpl#getCommand <em>Command</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ParameterImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParameterImpl extends DataObjectImpl implements Parameter
-{
- /**
- * The default value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected static final String COLUMN_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected String columnType = COLUMN_TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCommand() <em>Command</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCommand()
- * @generated
- * @ordered
- */
- protected static final String COMMAND_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCommand() <em>Command</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCommand()
- * @generated
- * @ordered
- */
- protected String command = COMMAND_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ParameterImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.PARAMETER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getColumnType()
- {
- return columnType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setColumnType(String newColumnType)
- {
- String oldColumnType = columnType;
- columnType = newColumnType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.PARAMETER__COLUMN_TYPE, oldColumnType, columnType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCommand()
- {
- return command;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCommand(String newCommand)
- {
- String oldCommand = command;
- command = newCommand;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.PARAMETER__COMMAND, oldCommand, command));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.PARAMETER__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.PARAMETER__COLUMN_TYPE:
- return getColumnType();
- case ConfigPackageImpl.PARAMETER__COMMAND:
- return getCommand();
- case ConfigPackageImpl.PARAMETER__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.PARAMETER__COLUMN_TYPE:
- setColumnType((String)newValue);
- return;
- case ConfigPackageImpl.PARAMETER__COMMAND:
- setCommand((String)newValue);
- return;
- case ConfigPackageImpl.PARAMETER__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.PARAMETER__COLUMN_TYPE:
- setColumnType(COLUMN_TYPE_EDEFAULT);
- return;
- case ConfigPackageImpl.PARAMETER__COMMAND:
- setCommand(COMMAND_EDEFAULT);
- return;
- case ConfigPackageImpl.PARAMETER__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.PARAMETER__COLUMN_TYPE:
- return COLUMN_TYPE_EDEFAULT == null ? columnType != null : !COLUMN_TYPE_EDEFAULT.equals(columnType);
- case ConfigPackageImpl.PARAMETER__COMMAND:
- return COMMAND_EDEFAULT == null ? command != null : !COMMAND_EDEFAULT.equals(command);
- case ConfigPackageImpl.PARAMETER__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (columnType: ");
- result.append(columnType);
- result.append(", command: ");
- result.append(command);
- result.append(", name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //ParameterImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/RelationshipImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/RelationshipImpl.java
deleted file mode 100644
index 002edf508c..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/RelationshipImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Relationship;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Relationship</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#getKeyPair <em>Key Pair</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#getForeignKeyTable <em>Foreign Key Table</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#isMany <em>Many</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.RelationshipImpl#getPrimaryKeyTable <em>Primary Key Table</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RelationshipImpl extends DataObjectImpl implements Relationship
-{
- /**
- * The cached value of the '{@link #getKeyPair() <em>Key Pair</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKeyPair()
- * @generated
- * @ordered
- */
- protected EList keyPair = null;
-
- /**
- * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected String config = CONFIG_EDEFAULT;
-
- /**
- * The default value of the '{@link #getForeignKeyTable() <em>Foreign Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getForeignKeyTable()
- * @generated
- * @ordered
- */
- protected static final String FOREIGN_KEY_TABLE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getForeignKeyTable() <em>Foreign Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getForeignKeyTable()
- * @generated
- * @ordered
- */
- protected String foreignKeyTable = FOREIGN_KEY_TABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isMany() <em>Many</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMany()
- * @generated
- * @ordered
- */
- protected static final boolean MANY_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isMany() <em>Many</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMany()
- * @generated
- * @ordered
- */
- protected boolean many = MANY_EDEFAULT;
-
- /**
- * This is true if the Many attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected boolean manyESet = false;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPrimaryKeyTable() <em>Primary Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKeyTable()
- * @generated
- * @ordered
- */
- protected static final String PRIMARY_KEY_TABLE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPrimaryKeyTable() <em>Primary Key Table</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPrimaryKeyTable()
- * @generated
- * @ordered
- */
- protected String primaryKeyTable = PRIMARY_KEY_TABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected RelationshipImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.RELATIONSHIP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getKeyPair()
- {
- if (keyPair == null)
- {
- keyPair = new EObjectContainmentEList(KeyPair.class, this, ConfigPackageImpl.RELATIONSHIP__KEY_PAIR);
- }
- return keyPair;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfig()
- {
- return config;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfig(String newConfig)
- {
- String oldConfig = config;
- config = newConfig;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RELATIONSHIP__CONFIG, oldConfig, config));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getForeignKeyTable()
- {
- return foreignKeyTable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setForeignKeyTable(String newForeignKeyTable)
- {
- String oldForeignKeyTable = foreignKeyTable;
- foreignKeyTable = newForeignKeyTable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RELATIONSHIP__FOREIGN_KEY_TABLE, oldForeignKeyTable, foreignKeyTable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMany()
- {
- return many;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMany(boolean newMany)
- {
- boolean oldMany = many;
- many = newMany;
- boolean oldManyESet = manyESet;
- manyESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RELATIONSHIP__MANY, oldMany, many, !oldManyESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetMany()
- {
- boolean oldMany = many;
- boolean oldManyESet = manyESet;
- many = MANY_EDEFAULT;
- manyESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, ConfigPackageImpl.RELATIONSHIP__MANY, oldMany, MANY_EDEFAULT, oldManyESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetMany()
- {
- return manyESet;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RELATIONSHIP__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPrimaryKeyTable()
- {
- return primaryKeyTable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPrimaryKeyTable(String newPrimaryKeyTable)
- {
- String oldPrimaryKeyTable = primaryKeyTable;
- primaryKeyTable = newPrimaryKeyTable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RELATIONSHIP__PRIMARY_KEY_TABLE, oldPrimaryKeyTable, primaryKeyTable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RELATIONSHIP__KEY_PAIR:
- return ((InternalEList)getKeyPair()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RELATIONSHIP__KEY_PAIR:
- return getKeyPair();
- case ConfigPackageImpl.RELATIONSHIP__CONFIG:
- return getConfig();
- case ConfigPackageImpl.RELATIONSHIP__FOREIGN_KEY_TABLE:
- return getForeignKeyTable();
- case ConfigPackageImpl.RELATIONSHIP__MANY:
- return isMany() ? Boolean.TRUE : Boolean.FALSE;
- case ConfigPackageImpl.RELATIONSHIP__NAME:
- return getName();
- case ConfigPackageImpl.RELATIONSHIP__PRIMARY_KEY_TABLE:
- return getPrimaryKeyTable();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RELATIONSHIP__KEY_PAIR:
- getKeyPair().clear();
- getKeyPair().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.RELATIONSHIP__CONFIG:
- setConfig((String)newValue);
- return;
- case ConfigPackageImpl.RELATIONSHIP__FOREIGN_KEY_TABLE:
- setForeignKeyTable((String)newValue);
- return;
- case ConfigPackageImpl.RELATIONSHIP__MANY:
- setMany(((Boolean)newValue).booleanValue());
- return;
- case ConfigPackageImpl.RELATIONSHIP__NAME:
- setName((String)newValue);
- return;
- case ConfigPackageImpl.RELATIONSHIP__PRIMARY_KEY_TABLE:
- setPrimaryKeyTable((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RELATIONSHIP__KEY_PAIR:
- getKeyPair().clear();
- return;
- case ConfigPackageImpl.RELATIONSHIP__CONFIG:
- setConfig(CONFIG_EDEFAULT);
- return;
- case ConfigPackageImpl.RELATIONSHIP__FOREIGN_KEY_TABLE:
- setForeignKeyTable(FOREIGN_KEY_TABLE_EDEFAULT);
- return;
- case ConfigPackageImpl.RELATIONSHIP__MANY:
- unsetMany();
- return;
- case ConfigPackageImpl.RELATIONSHIP__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.RELATIONSHIP__PRIMARY_KEY_TABLE:
- setPrimaryKeyTable(PRIMARY_KEY_TABLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RELATIONSHIP__KEY_PAIR:
- return keyPair != null && !keyPair.isEmpty();
- case ConfigPackageImpl.RELATIONSHIP__CONFIG:
- return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
- case ConfigPackageImpl.RELATIONSHIP__FOREIGN_KEY_TABLE:
- return FOREIGN_KEY_TABLE_EDEFAULT == null ? foreignKeyTable != null : !FOREIGN_KEY_TABLE_EDEFAULT.equals(foreignKeyTable);
- case ConfigPackageImpl.RELATIONSHIP__MANY:
- return isSetMany();
- case ConfigPackageImpl.RELATIONSHIP__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ConfigPackageImpl.RELATIONSHIP__PRIMARY_KEY_TABLE:
- return PRIMARY_KEY_TABLE_EDEFAULT == null ? primaryKeyTable != null : !PRIMARY_KEY_TABLE_EDEFAULT.equals(primaryKeyTable);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (config: ");
- result.append(config);
- result.append(", foreignKeyTable: ");
- result.append(foreignKeyTable);
- result.append(", many: ");
- if (manyESet) result.append(many); else result.append("<unset>");
- result.append(", name: ");
- result.append(name);
- result.append(", primaryKeyTable: ");
- result.append(primaryKeyTable);
- result.append(')');
- return result.toString();
- }
-
-} //RelationshipImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ResultDescriptorImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ResultDescriptorImpl.java
deleted file mode 100644
index f6b6e1c8f8..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/ResultDescriptorImpl.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import org.apache.tuscany.das.rdb.config.ResultDescriptor;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Result Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl#getColumnName <em>Column Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl#getColumnType <em>Column Type</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl#getCommand <em>Command</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl#getConverter <em>Converter</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.ResultDescriptorImpl#getTableName <em>Table Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ResultDescriptorImpl extends DataObjectImpl implements ResultDescriptor
-{
- /**
- * The default value of the '{@link #getColumnName() <em>Column Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnName()
- * @generated
- * @ordered
- */
- protected static final String COLUMN_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getColumnName() <em>Column Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnName()
- * @generated
- * @ordered
- */
- protected String columnName = COLUMN_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected static final String COLUMN_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getColumnType() <em>Column Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumnType()
- * @generated
- * @ordered
- */
- protected String columnType = COLUMN_TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCommand() <em>Command</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCommand()
- * @generated
- * @ordered
- */
- protected static final String COMMAND_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCommand() <em>Command</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCommand()
- * @generated
- * @ordered
- */
- protected String command = COMMAND_EDEFAULT;
-
- /**
- * The default value of the '{@link #getConverter() <em>Converter</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverter()
- * @generated
- * @ordered
- */
- protected static final String CONVERTER_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConverter() <em>Converter</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverter()
- * @generated
- * @ordered
- */
- protected String converter = CONVERTER_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTableName() <em>Table Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTableName()
- * @generated
- * @ordered
- */
- protected static final String TABLE_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTableName() <em>Table Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTableName()
- * @generated
- * @ordered
- */
- protected String tableName = TABLE_NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ResultDescriptorImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.RESULT_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getColumnName()
- {
- return columnName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setColumnName(String newColumnName)
- {
- String oldColumnName = columnName;
- columnName = newColumnName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_NAME, oldColumnName, columnName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getColumnType()
- {
- return columnType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setColumnType(String newColumnType)
- {
- String oldColumnType = columnType;
- columnType = newColumnType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_TYPE, oldColumnType, columnType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCommand()
- {
- return command;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCommand(String newCommand)
- {
- String oldCommand = command;
- command = newCommand;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RESULT_DESCRIPTOR__COMMAND, oldCommand, command));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConverter()
- {
- return converter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConverter(String newConverter)
- {
- String oldConverter = converter;
- converter = newConverter;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RESULT_DESCRIPTOR__CONVERTER, oldConverter, converter));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTableName()
- {
- return tableName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTableName(String newTableName)
- {
- String oldTableName = tableName;
- tableName = newTableName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.RESULT_DESCRIPTOR__TABLE_NAME, oldTableName, tableName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_NAME:
- return getColumnName();
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_TYPE:
- return getColumnType();
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COMMAND:
- return getCommand();
- case ConfigPackageImpl.RESULT_DESCRIPTOR__CONVERTER:
- return getConverter();
- case ConfigPackageImpl.RESULT_DESCRIPTOR__TABLE_NAME:
- return getTableName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_NAME:
- setColumnName((String)newValue);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_TYPE:
- setColumnType((String)newValue);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COMMAND:
- setCommand((String)newValue);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__CONVERTER:
- setConverter((String)newValue);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__TABLE_NAME:
- setTableName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_NAME:
- setColumnName(COLUMN_NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_TYPE:
- setColumnType(COLUMN_TYPE_EDEFAULT);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COMMAND:
- setCommand(COMMAND_EDEFAULT);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__CONVERTER:
- setConverter(CONVERTER_EDEFAULT);
- return;
- case ConfigPackageImpl.RESULT_DESCRIPTOR__TABLE_NAME:
- setTableName(TABLE_NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_NAME:
- return COLUMN_NAME_EDEFAULT == null ? columnName != null : !COLUMN_NAME_EDEFAULT.equals(columnName);
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COLUMN_TYPE:
- return COLUMN_TYPE_EDEFAULT == null ? columnType != null : !COLUMN_TYPE_EDEFAULT.equals(columnType);
- case ConfigPackageImpl.RESULT_DESCRIPTOR__COMMAND:
- return COMMAND_EDEFAULT == null ? command != null : !COMMAND_EDEFAULT.equals(command);
- case ConfigPackageImpl.RESULT_DESCRIPTOR__CONVERTER:
- return CONVERTER_EDEFAULT == null ? converter != null : !CONVERTER_EDEFAULT.equals(converter);
- case ConfigPackageImpl.RESULT_DESCRIPTOR__TABLE_NAME:
- return TABLE_NAME_EDEFAULT == null ? tableName != null : !TABLE_NAME_EDEFAULT.equals(tableName);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (columnName: ");
- result.append(columnName);
- result.append(", columnType: ");
- result.append(columnType);
- result.append(", command: ");
- result.append(command);
- result.append(", converter: ");
- result.append(converter);
- result.append(", tableName: ");
- result.append(tableName);
- result.append(')');
- return result.toString();
- }
-
-} //ResultDescriptorImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/TableImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/TableImpl.java
deleted file mode 100644
index b63816c350..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/impl/TableImpl.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.tuscany.das.rdb.config.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Table;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getColumn <em>Column</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getCreate <em>Create</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getDelete <em>Delete</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getPropertyName <em>Property Name</em>}</li>
- * <li>{@link org.apache.tuscany.das.rdb.config.impl.TableImpl#getUpdate <em>Update</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TableImpl extends DataObjectImpl implements Table
-{
- /**
- * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getColumn()
- * @generated
- * @ordered
- */
- protected EList column = null;
-
- /**
- * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected static final String CONFIG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConfig()
- * @generated
- * @ordered
- */
- protected String config = CONFIG_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCreate() <em>Create</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCreate()
- * @generated
- * @ordered
- */
- protected static final String CREATE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCreate() <em>Create</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCreate()
- * @generated
- * @ordered
- */
- protected String create = CREATE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDelete() <em>Delete</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDelete()
- * @generated
- * @ordered
- */
- protected static final String DELETE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDelete() <em>Delete</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDelete()
- * @generated
- * @ordered
- */
- protected String delete = DELETE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPropertyName()
- * @generated
- * @ordered
- */
- protected static final String PROPERTY_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPropertyName() <em>Property Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPropertyName()
- * @generated
- * @ordered
- */
- protected String propertyName = PROPERTY_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getUpdate() <em>Update</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUpdate()
- * @generated
- * @ordered
- */
- protected static final String UPDATE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getUpdate() <em>Update</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUpdate()
- * @generated
- * @ordered
- */
- protected String update = UPDATE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected TableImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return ConfigPackageImpl.Literals.TABLE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getColumn()
- {
- if (column == null)
- {
- column = new EObjectContainmentEList(Column.class, this, ConfigPackageImpl.TABLE__COLUMN);
- }
- return column;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConfig()
- {
- return config;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConfig(String newConfig)
- {
- String oldConfig = config;
- config = newConfig;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__CONFIG, oldConfig, config));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCreate()
- {
- return create;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCreate(String newCreate)
- {
- String oldCreate = create;
- create = newCreate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__CREATE, oldCreate, create));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDelete()
- {
- return delete;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDelete(String newDelete)
- {
- String oldDelete = delete;
- delete = newDelete;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__DELETE, oldDelete, delete));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPropertyName()
- {
- return propertyName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPropertyName(String newPropertyName)
- {
- String oldPropertyName = propertyName;
- propertyName = newPropertyName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__PROPERTY_NAME, oldPropertyName, propertyName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getUpdate()
- {
- return update;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUpdate(String newUpdate)
- {
- String oldUpdate = update;
- update = newUpdate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackageImpl.TABLE__UPDATE, oldUpdate, update));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.TABLE__COLUMN:
- return ((InternalEList)getColumn()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.TABLE__COLUMN:
- return getColumn();
- case ConfigPackageImpl.TABLE__CONFIG:
- return getConfig();
- case ConfigPackageImpl.TABLE__CREATE:
- return getCreate();
- case ConfigPackageImpl.TABLE__DELETE:
- return getDelete();
- case ConfigPackageImpl.TABLE__NAME:
- return getName();
- case ConfigPackageImpl.TABLE__PROPERTY_NAME:
- return getPropertyName();
- case ConfigPackageImpl.TABLE__UPDATE:
- return getUpdate();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.TABLE__COLUMN:
- getColumn().clear();
- getColumn().addAll((Collection)newValue);
- return;
- case ConfigPackageImpl.TABLE__CONFIG:
- setConfig((String)newValue);
- return;
- case ConfigPackageImpl.TABLE__CREATE:
- setCreate((String)newValue);
- return;
- case ConfigPackageImpl.TABLE__DELETE:
- setDelete((String)newValue);
- return;
- case ConfigPackageImpl.TABLE__NAME:
- setName((String)newValue);
- return;
- case ConfigPackageImpl.TABLE__PROPERTY_NAME:
- setPropertyName((String)newValue);
- return;
- case ConfigPackageImpl.TABLE__UPDATE:
- setUpdate((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.TABLE__COLUMN:
- getColumn().clear();
- return;
- case ConfigPackageImpl.TABLE__CONFIG:
- setConfig(CONFIG_EDEFAULT);
- return;
- case ConfigPackageImpl.TABLE__CREATE:
- setCreate(CREATE_EDEFAULT);
- return;
- case ConfigPackageImpl.TABLE__DELETE:
- setDelete(DELETE_EDEFAULT);
- return;
- case ConfigPackageImpl.TABLE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.TABLE__PROPERTY_NAME:
- setPropertyName(PROPERTY_NAME_EDEFAULT);
- return;
- case ConfigPackageImpl.TABLE__UPDATE:
- setUpdate(UPDATE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case ConfigPackageImpl.TABLE__COLUMN:
- return column != null && !column.isEmpty();
- case ConfigPackageImpl.TABLE__CONFIG:
- return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
- case ConfigPackageImpl.TABLE__CREATE:
- return CREATE_EDEFAULT == null ? create != null : !CREATE_EDEFAULT.equals(create);
- case ConfigPackageImpl.TABLE__DELETE:
- return DELETE_EDEFAULT == null ? delete != null : !DELETE_EDEFAULT.equals(delete);
- case ConfigPackageImpl.TABLE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case ConfigPackageImpl.TABLE__PROPERTY_NAME:
- return PROPERTY_NAME_EDEFAULT == null ? propertyName != null : !PROPERTY_NAME_EDEFAULT.equals(propertyName);
- case ConfigPackageImpl.TABLE__UPDATE:
- return UPDATE_EDEFAULT == null ? update != null : !UPDATE_EDEFAULT.equals(update);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (config: ");
- result.append(config);
- result.append(", create: ");
- result.append(create);
- result.append(", delete: ");
- result.append(delete);
- result.append(", name: ");
- result.append(name);
- result.append(", propertyName: ");
- result.append(propertyName);
- result.append(", update: ");
- result.append(update);
- result.append(')');
- return result.toString();
- }
-
-} //TableImpl
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
deleted file mode 100644
index 92499bd000..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.config.wrapper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Key;
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConfigFactory;
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.impl.ConfigFactoryImpl;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-
-public class MappingWrapper {
-
- private static final ConfigFactory factory = ConfigFactoryImpl.eINSTANCE;
-
- private static final boolean debug = false;
-
- private Config config;
-
- public MappingWrapper() {
- // Empty Constructor
- }
-
- public MappingWrapper(Config mapping) {
- this.config = mapping;
- }
-
- public Config getConfig() {
- return this.config;
- }
-
-
- public Table getTable(String name) {
- if (config == null)
- return null;
- DebugUtil.debugln(getClass(), debug, "Looking for table " + name);
- Iterator i = config.getTable().iterator();
- while (i.hasNext()) {
- Table t = (Table) i.next();
- if (name.equals(t.getName()))
- return t;
- }
-
- return null;
- }
-
- public Table getTableByPropertyName(String name) {
- if (config == null)
- return null;
- DebugUtil.debugln(getClass(), debug, "Looking for table by property: "
- + name);
- Iterator i = config.getTable().iterator();
- while (i.hasNext()) {
- Table t = (Table) i.next();
- TableWrapper wrapper = new TableWrapper(t);
- if (name.equals(wrapper.getPropertyName()))
- return t;
- }
-
- throw new RuntimeException("Table with property name " + name
- + " not found.");
-
- }
-
- public void addRelationship(String parentName, String childName) {
-
- if (config == null)
- config = factory.createConfig();
-
- QualifiedColumn parent = new QualifiedColumn(parentName);
- QualifiedColumn child = new QualifiedColumn(childName);
-
- Relationship r = factory.createRelationship();
- r.setName(child.getTableName());
- r.setPrimaryKeyTable(parent.getTableName());
- r.setForeignKeyTable(child.getTableName());
- DebugUtil.debugln(getClass(), debug, "Created relationship from "
- + r.getPrimaryKeyTable() + " to " + r.getForeignKeyTable() + " named "
- + r.getName());
-
- KeyPair pair = factory.createKeyPair();
- pair.setPrimaryKeyColumn(parent.getColumnName());
- pair.setForeignKeyColumn(child.getColumnName());
-
- r.getKeyPair().add(pair);
- r.setMany(true);
-
- config.getRelationship().add(r);
-
- }
-
-
- public void addRelationship(Key parentKey, Key childKey) {
-
- if (config == null)
- config = factory.createConfig();
-
- QualifiedColumn parent = new QualifiedColumn((String) parentKey.getColumNames().get(0));
- QualifiedColumn child = new QualifiedColumn((String) childKey.getColumNames().get(0));
-
- Relationship r = factory.createRelationship();
- r.setName(child.getTableName());
- r.setPrimaryKeyTable(parent.getTableName());
- r.setForeignKeyTable(child.getTableName());
- DebugUtil.debugln(getClass(), debug, "Created relationship from "
- + r.getPrimaryKeyTable() + " to " + r.getForeignKeyTable() + " named "
- + r.getName());
-
-
- Iterator i = parentKey.getColumNames().iterator();
- Iterator j = childKey.getColumNames().iterator();
- while ( i.hasNext() && j.hasNext()) {
- parent = new QualifiedColumn((String) i.next());
- child = new QualifiedColumn((String) j.next());
- KeyPair pair = factory.createKeyPair();
- pair.setPrimaryKeyColumn(parent.getColumnName());
- pair.setForeignKeyColumn(child.getColumnName());
-
- r.getKeyPair().add(pair);
- }
- r.setMany(true);
- config.getRelationship().add(r);
-
- }
-
- public void addPrimaryKey(String columnName) {
- Key k = new Key(columnName);
- addPrimaryKey(k, false);
- }
-
- public void addPrimaryKey(Key key) {
- addPrimaryKey(key, false);
- }
-
- public void addGeneratedPrimaryKey(String columnName) {
- Key key = new Key(columnName);
- addPrimaryKey(key, true);
- }
-
- private void addPrimaryKey(Key key, boolean generated) {
- if (config == null)
- config = factory.createConfig();
-
- Iterator i = key.getColumNames().iterator();
- while (i.hasNext()) {
- String columnName = (String) i.next();
-
- QualifiedColumn pkColumn = new QualifiedColumn(columnName);
- Table t = findOrCreateTable(pkColumn.getTableName());
- Column c = findOrCreateColumn(t, pkColumn.getColumnName());
- c.setPrimaryKey(true);
- if ( generated )
- c.setGenerated(true);
-
- t.getColumn().add(c);
- }
- }
-
-
-
- public String getTablePropertyName(String tableName) {
- Table t = getTable(tableName);
- if (t == null)
- return tableName;
- String propertyName = t.getPropertyName();
-
- if (propertyName == null)
- return tableName;
-
- return propertyName;
- }
-
- public Column getColumn(Table t, String name) {
- if (t == null)
- return null;
- Iterator i = t.getColumn().iterator();
- while (i.hasNext()) {
- Column c = (Column) i.next();
- if (c.getName().equals(name)) {
- return c;
- }
- }
- DebugUtil.debugln(getClass(), debug, "WARNING: Could not find column "
- + name + " in table " + t.getName());
- return null;
- }
-
- public String getColumnPropertyName(String tableName, String columnName) {
- Table t = getTable(tableName);
- Column c = getColumn(t, columnName);
- if (c == null)
- return columnName;
-
- String propertyName = c.getPropertyName();
- if (propertyName == null)
- return c.getName();
-
- return propertyName;
- }
-
- public void addCollisionColumn(String columnName) {
-
- if (config == null)
- config = factory.createConfig();
-
- QualifiedColumn occColumn = new QualifiedColumn(columnName);
- Table t = findOrCreateTable(occColumn.getTableName());
- Column c = findOrCreateColumn(t, occColumn.getColumnName());
- c.setCollision(true);
-
- config.getTable().add(t);
- }
-
- private Table findOrCreateTable(String tableName) {
- Table table = getTable(tableName);
- if (table == null) {
- table = ConfigFactoryImpl.eINSTANCE.createTable();
- table.setName(tableName);
- config.getTable().add(table);
- }
- return table;
-
- }
-
- private Column findOrCreateColumn(Table t, String name) {
- Iterator i = t.getColumn().iterator();
- while (i.hasNext()) {
- Column c = (Column) i.next();
- if (name.equals(c.getName()))
- return c;
- }
-
- Column c = ConfigFactoryImpl.eINSTANCE.createColumn();
- c.setName(name);
- t.getColumn().add(c);
- return c;
- }
-
- public boolean hasRecursiveRelationships() {
- if (config != null) {
- Iterator i = getConfig().getRelationship().iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
- if (r.getPrimaryKeyTable().equals(r.getForeignKeyTable()))
- return true;
- }
- }
- return false;
- }
-
- public Collection getRelationshipsByChildTable(String name) {
- ArrayList results = new ArrayList();
- if (config != null) {
- Iterator i = getConfig().getRelationship().iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
- if (name.equals(r.getForeignKeyTable()))
- results.add(r);
- }
- }
- return results;
- }
-
- // TODO optimize
- public ArrayList getInsertOrder() {
- DebugUtil.debugln(getClass(), debug, "Getting insert order");
- ArrayList inserts = new ArrayList();
- HashMap parentToChild = new HashMap();
-
- ArrayList parents = new ArrayList();
- ArrayList children = new ArrayList();
- if (config != null) {
- Iterator i = getConfig().getRelationship().iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
- parents.add(r.getPrimaryKeyTable());
- children.add(r.getForeignKeyTable());
- parentToChild.put(r.getPrimaryKeyTable(), r.getForeignKeyTable());
- }
-
- while (parents.size() > 0) {
- String parent = (String) parents.get(0);
- if (!children.contains(parent)) {
- if (!inserts.contains(parent))
- inserts.add(parent);
-
- String child = (String) parentToChild.get(parent);
- if (!inserts.contains(child))
- inserts.add(child);
-
- parents.remove(parent);
- children.remove(child);
- } else {
- parents.add(parents.remove(0));
- }
- }
- inserts.addAll(children);
-
- }
-
- DebugUtil.debugln(getClass(), debug, inserts);
- return inserts;
- }
-
- public ArrayList getDeleteOrder() {
- ArrayList deleteOrder = new ArrayList();
- deleteOrder.addAll(getInsertOrder());
- Collections.reverse(deleteOrder);
- return deleteOrder;
- }
-
- public void addConverter(String name, String converter) {
- if (config == null)
- config = factory.createConfig();
-
- QualifiedColumn column = new QualifiedColumn(name);
- Table t = findOrCreateTable(column.getTableName());
- Column c = findOrCreateColumn(t, column.getColumnName());
- c.setConverterClassName(converter);
-
- }
-
- public String getConverter(String tableName, String columnName) {
- Table t = getTable(tableName);
- Column c = getColumn(t, columnName);
- if (c != null)
- return c.getConverterClassName();
- return null;
- }
-
- public HashMap getConverters(Table table) {
- HashMap converters = new HashMap();
-
- Iterator columns = table.getColumn().iterator();
- while ( columns.hasNext() ) {
- Column c = (Column) columns.next();
- if ( c.getConverterClassName() != null ) {
- String property = c.getPropertyName();
- if ( property == null )
- property = c.getName();
- converters.put(property, c.getConverterClassName());
- }
- }
- return converters;
- }
-
- public Relationship getRelationshipByName(String name) {
- Iterator i = config.getRelationship().iterator();
- while ( i.hasNext() ) {
- Relationship r = (Relationship) i.next();
- if ( name.equals (r.getName()))
- return r;
- }
- throw new RuntimeException("Could not find relationship " + name + " in the configuration");
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
deleted file mode 100644
index 6babe0c349..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.config.wrapper;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-public class QualifiedColumn {
-
- private final String tableName;
- private final String columnName;
- private static boolean debug = false;
-
- public QualifiedColumn(String name) {
- tableName = name.substring(0, name.indexOf('.'));
- columnName = name.substring(name.indexOf('.') + 1);
- DebugUtil.debugln(getClass(), debug, tableName);
- DebugUtil.debugln(getClass(), debug, columnName);
- }
-
- public String getTableName() {
- return this.tableName;
- }
-
- public String getColumnName() {
- return this.columnName;
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
deleted file mode 100644
index 14403367d8..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.config.wrapper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Relationship;
-
-public class RelationshipWrapper {
-
- private Relationship relationship;
-
- public RelationshipWrapper(Relationship r) {
- this.relationship = r;
- }
-
- public Collection getForeignKeys() {
- ArrayList keys = new ArrayList();
- Iterator i = this.relationship.getKeyPair().iterator();
- while ( i.hasNext()) {
- KeyPair pair = (KeyPair) i.next();
- keys.add(pair.getForeignKeyColumn());
- }
- return keys;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
deleted file mode 100644
index 2c2d1dc677..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.config.wrapper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Table;
-
-public class TableWrapper {
-
- private Table table;
-
- public TableWrapper(Table table) {
- this.table = table;
- }
-
- public String getPropertyName() {
- return table.getPropertyName() == null ? table.getName() : table
- .getPropertyName();
- }
-
- public Collection getPrimaryKeyNames() {
- ArrayList pkNames = new ArrayList();
- Iterator i = table.getColumn().iterator();
- while (i.hasNext()) {
- Column c = (Column) i.next();
- if (c.isPrimaryKey())
- pkNames.add(c.getName());
- }
- return pkNames;
- }
-
- public Collection getPrimaryKeyProperties() {
-
- ArrayList keyProperties = new ArrayList();
- Iterator columns = table.getColumn().iterator();
- while (columns.hasNext()) {
- Column c = (Column) columns.next();
- if (c.isPrimaryKey()) {
- keyProperties.add(getColumnPropertyName(c));
- }
- }
-
- return keyProperties;
- }
-
- private String getColumnPropertyName(Column c) {
- if (c.getPropertyName() != null)
- return c.getPropertyName();
- else
- return c.getName();
- }
-
- public boolean isGeneratedColumnProperty(String name) {
- Column c = getColumnByPropertyName(name);
- return c == null ? false : c.isGenerated();
- }
-
- // public Object getColumnNameByProperty(String propertyName) {
- // Iterator i = table.getColumn().iterator();
- // while (i.hasNext()) {
- // Column c = (Column) i.next();
- // if (propertyName.equals(c.getPropertyName()))
- // return c.getName();
- // }
- // return propertyName;
- // }
-
- public String getConverter(String propertyName) {
- Column c = getColumnByPropertyName(propertyName);
- return (c == null) ? null : c.getConverterClassName();
- }
-
- public Column getColumnByPropertyName(String propertyName) {
- Iterator columns = table.getColumn().iterator();
- while (columns.hasNext()) {
- Column c = (Column) columns.next();
- String property = c.getPropertyName();
- if (property == null)
- property = c.getName();
- if (propertyName.equals(property))
- return c;
- }
-
- return null;
- }
-
- public Column getCollisionColumn() {
- Iterator columns = table.getColumn().iterator();
- while (columns.hasNext()) {
- Column c = (Column) columns.next();
- if ( c.isCollision() )
- return c;
- }
-
- return null;
-
- }
-
- public String getCollisionColumnPropertyName() {
- Column c = getCollisionColumn();
- if ( c.getPropertyName() != null )
- return c.getPropertyName();
- else
- return c.getName();
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/CudGenerator.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/CudGenerator.java
deleted file mode 100644
index 31ab7b2801..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/CudGenerator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.generator.impl;
-
-import java.util.Collection;
-
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.impl.DeleteCommandImpl;
-import org.apache.tuscany.das.rdb.impl.InsertCommandImpl;
-import org.apache.tuscany.das.rdb.impl.WriteCommandImpl;
-
-import commonj.sdo.DataObject;
-
-public class CudGenerator {
-
- private static final UpdateGenerator updateGenerator = UpdateGenerator.instance;
-
- private static final InsertGenerator insertGenerator = InsertGenerator.instance;
-
- private static final DeleteGenerator deleteGenerator = DeleteGenerator.instance;
-
- public DeleteCommandImpl getDeleteCommand(Table t) {
- return deleteGenerator.getDeleteCommand(t);
- }
-
- public Collection getDeleteParameters(Table table) {
- return deleteGenerator.getDeleteParameters(table);
- }
-
- public Collection getCreateParameters(MappingWrapper mapping, DataObject changedObject, Table table) {
- return insertGenerator.getInsertParameters(mapping, changedObject, table);
- }
-
- public InsertCommandImpl getInsertCommand(MappingWrapper mapping, DataObject changedObject,
- Table table) {
- return insertGenerator.getInsertCommand(mapping, changedObject, table);
- }
-
- public WriteCommandImpl getUpdateCommand(MappingWrapper mapping,
- DataObject changedObject, Table table) {
- return updateGenerator.getUpdateCommand(mapping, changedObject, table);
- }
-
- public Collection getUpdateParameters(DataObject changedObject, Table table) {
- return updateGenerator.getUpdateParameters(changedObject, table);
- }
-
-}
-
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
deleted file mode 100644
index c2d312b56d..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.generator.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.SDODataTypes;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.impl.DeleteCommandImpl;
-import org.apache.tuscany.das.rdb.impl.ParameterImpl;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-public class DeleteGenerator {
-
- public static final DeleteGenerator instance = new DeleteGenerator();
-
- private static final boolean debug = false;
-
- public DeleteGenerator() {
- super();
- }
-
- public String getDeleteStatement(Table t) {
- TableWrapper table = new TableWrapper(t);
-
- StringBuffer statement = new StringBuffer();
- statement.append("delete from ");
- statement.append(t.getName());
- statement.append(" where ");
-
- Iterator names = table.getPrimaryKeyNames().iterator();
- Iterator properties = table.getPrimaryKeyProperties().iterator();
- while (names.hasNext() && properties.hasNext()) {
- String name = (String) names.next();
- statement.append(name);
- statement.append(" = ?");
- if (names.hasNext() && properties.hasNext())
- statement.append(" and ");
- }
-
- DebugUtil.debugln(getClass(), debug, statement.toString());
- return statement.toString();
- }
-
- public Collection getDeleteParameters(Table table) {
- TableWrapper wrapper = new TableWrapper(table);
- return wrapper.getPrimaryKeyProperties();
- }
-
- public DeleteCommandImpl getDeleteCommand(Table t) {
- DeleteCommandImpl deleteCommand = new DeleteCommandImpl(getDeleteStatement(t));
-
- Iterator i = getDeleteParameters(t).iterator();
- for(int idx=1; i.hasNext(); idx++) {
- String property = (String) i.next();
- Parameter p = new ParameterImpl();
- p.setName(property);
- p.setType(SDODataTypes.OBJECT);
- p.setConverter(getConverter(t, property));
- p.setIndex(idx);
- deleteCommand.addParameter(p);
- }
- return deleteCommand;
- }
-
- private Converter getConverter(Table t, String name) {
- TableWrapper tw = new TableWrapper(t);
- String converter = tw.getConverter(name);
- if ( converter != null ) {
- try {
- return (Converter) Class.forName(converter).newInstance();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
- return null;
- }
-
-}
-
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
deleted file mode 100644
index 9e324e2dd3..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.generator.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.impl.InsertCommandImpl;
-import org.apache.tuscany.das.rdb.impl.ParameterImpl;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-public class InsertGenerator {
-
- public static final InsertGenerator instance = new InsertGenerator();
-
- private static final boolean debug = false;
-
- public InsertGenerator() {
- super();
- }
-
- public InsertCommandImpl getInsertCommand(MappingWrapper config,
- DataObject changedObject, Table t) {
- ArrayList parameters = new ArrayList();
- TableWrapper table = new TableWrapper(t);
- StringBuffer statement = new StringBuffer("insert into ");
- statement.append(t.getName());
-
- Iterator i = getAttributeProperties(changedObject, config).iterator();
-
- ArrayList attributes = new ArrayList();
- while (i.hasNext()) {
- Property attr = (Property) i.next();
- if (!table.isGeneratedColumnProperty(attr.getName())) {
- attributes.add(attr.getName());
- parameters.add(changedObject.getType().getProperty(
- attr.getName()));
- }
- }
-
- statement.append("(");
- Iterator attrs = attributes.iterator();
- while (attrs.hasNext()) {
- String name = (String) attrs.next();
- statement.append("");
- statement.append(name);
- if (attrs.hasNext())
- statement.append(", ");
- else
- statement.append(")");
- }
-
- statement.append(" values (");
- for (int idx = 1; idx <= attributes.size(); idx++) {
- statement.append('?');
- if (idx < attributes.size())
- statement.append(", ");
- else
- statement.append(")");
- }
-
- InsertCommandImpl cmd = new InsertCommandImpl(statement.toString());
- Iterator params = parameters.iterator();
- for (int idx = 1; params.hasNext(); idx++) {
- Property property = (Property) params.next();
- Parameter p = new ParameterImpl();
- p.setName(property.getName());
- p.setType(property.getType());
- p.setConverter(getConverter(table, property.getName()));
- p.setIndex(idx);
- cmd.addParameter(p);
-
- }
- DebugUtil.debugln(getClass(), debug, statement.toString());
- return cmd;
-
- }
-
- private Converter getConverter(TableWrapper tw, String name) {
- String converter = tw.getConverter(name);
- if ( converter != null ) {
- try {
- return (Converter) Class.forName(converter).newInstance();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
- return null;
- }
-
- private List getAttributeProperties(DataObject obj, MappingWrapper config) {
- ArrayList fields = new ArrayList();
- Iterator i = obj.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property p = (Property) i.next();
- if (p.getType().isDataType()) {
- if (obj.isSet(p))
- fields.add(p);
- } else {
- if (!p.isMany() && obj.isSet(p)) {
- Relationship relationship = config.getRelationshipByName(p
- .getOpposite().getName());
-
- RelationshipWrapper r = new RelationshipWrapper(
- relationship);
- Iterator keys = r.getForeignKeys().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
- Property keyProp = obj.getType().getProperty(key);
- fields.add(keyProp);
- }
-
- }
- }
- }
-
- return fields;
-
- }
-
- public Collection getInsertParameters(MappingWrapper config,
- DataObject changedObject, Table table) {
- ArrayList parameters = new ArrayList();
- TableWrapper wrapper = new TableWrapper(table);
-
- Iterator i = getAttributeProperties(changedObject, config).iterator();
-
- while (i.hasNext()) {
- Property attr = (Property) i.next();
- if (!wrapper.isGeneratedColumnProperty(attr.getName()))
- parameters.add(changedObject.getType().getProperty(
- attr.getName()));
- }
-
- return parameters;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
deleted file mode 100644
index f22b352f51..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.generator.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.impl.OptimisticWriteCommandImpl;
-import org.apache.tuscany.das.rdb.impl.ParameterImpl;
-import org.apache.tuscany.das.rdb.impl.UpdateCommandImpl;
-import org.apache.tuscany.das.rdb.impl.WriteCommandImpl;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-public class UpdateGenerator {
-
- private boolean debug = false;
-
- public static UpdateGenerator instance = new UpdateGenerator();
-
- public UpdateGenerator() {
- super();
- }
-
- public WriteCommandImpl getUpdateCommand(MappingWrapper mapping, DataObject changedObject, Table table) {
- ArrayList parameters = new ArrayList();
- Type type = changedObject.getType();
- TableWrapper t = new TableWrapper(table);
- StringBuffer statement = new StringBuffer("update ");
- statement.append(table.getName());
- statement.append(" set ");
-
-
- ChangeSummary summary = changedObject.getDataGraph().getChangeSummary();
- Iterator i = getChangedFields(mapping, summary, changedObject).iterator();
-
- while (i.hasNext()) {
- Property attr = (Property) i.next();
- Column c = t.getColumnByPropertyName(attr.getName());
- if ((c != null) && (c.isCollision() || c.isPrimaryKey())) {
- // get rid of comma if OCC or PK is last field
- if (!i.hasNext()) {
- statement
- .delete(statement.length() - 2, statement.length());
- }
- } else {
- parameters.add(attr);
- statement.append(c == null ? attr.getName() : c.getName());
- statement.append(" = ?");
- if (i.hasNext())
- statement.append(", ");
- }
- }
-
- statement.append(" where ");
-
- Iterator names = t.getPrimaryKeyNames().iterator();
- Iterator properties = t.getPrimaryKeyProperties().iterator();
- while (names.hasNext() && properties.hasNext()) {
- String name = (String) names.next();
- String property = (String) properties.next();
- statement.append(name);
- statement.append(" = ?");
- if (names.hasNext() && properties.hasNext())
- statement.append(" and ");
- parameters.add(type.getProperty(property));
- }
-
- if (t.getCollisionColumn() != null) {
- statement.append(" and ");
- statement.append(t.getCollisionColumn().getName());
- statement.append(" = ?");
- parameters.add(type.getProperty(t.getCollisionColumnPropertyName()));
- }
-
-
- WriteCommandImpl updateCommand;
- if ( t.getCollisionColumn() != null )
- updateCommand = new OptimisticWriteCommandImpl(statement.toString());
- else
- updateCommand = new UpdateCommandImpl(statement.toString());
-
- Iterator params = parameters.iterator();
- for (int idx = 1; params.hasNext(); idx++ ) {
- Property p = (Property)params.next();
- Parameter param = new ParameterImpl();
- param.setName(p.getName());
- param.setType(p.getType());
- param.setConverter(getConverter(t, p.getName()));
- param.setIndex(idx);
- updateCommand.addParameter(param);
- }
- DebugUtil.debugln(getClass(), debug, statement.toString());
- return updateCommand;
- }
-
- private List getAttributeProperties(DataObject obj) {
- ArrayList fields = new ArrayList();
- Iterator i = obj.getType().getProperties().iterator();
- while ( i.hasNext() ) {
- Property p = (Property) i.next();
- if ( p.getType().isDataType())
- fields.add(p);
- }
- return fields;
- }
-
-
- private List getChangedFields(MappingWrapper mapping, ChangeSummary summary, DataObject obj) {
- ArrayList changes = new ArrayList();
- Iterator i = summary.getOldValues(obj).iterator();
- while (i.hasNext()) {
- ChangeSummary.Setting setting = (ChangeSummary.Setting) i.next();
- if (setting.getProperty().getType().isDataType()) {
- changes.add(setting.getProperty());
- } else {
- Property ref = setting.getProperty();
- if ( !ref.isMany() ) {
- RelationshipWrapper r = new RelationshipWrapper(mapping.getRelationshipByName(ref.getOpposite().getName()));
- Iterator keys = r.getForeignKeys().iterator();
- while ( keys.hasNext()) {
- String key = (String) keys.next();
- Property p = obj.getType().getProperty(key);
- changes.add(p);
- }
- }
-
- }
- }
- return changes;
- }
-
-
- private Converter getConverter(TableWrapper tw, String name) {
- String converter = tw.getConverter(name);
- if ( converter != null ) {
- try {
- return (Converter) Class.forName(converter).newInstance();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
- return null;
- }
-
- public Collection getUpdateParameters(DataObject changedObject, Table table) {
- Type type = changedObject.getType();
- TableWrapper wrapper = new TableWrapper(table);
- Collection pkNames = wrapper.getPrimaryKeyProperties();
- ArrayList parameters = new ArrayList();
- ArrayList pkParams = new ArrayList();
-
- Iterator i = getAttributeProperties(changedObject).iterator();
- while (i.hasNext()) {
- Property attr = (Property) i.next();
- String field = attr.getName();
-
- Parameter p = getParameter(wrapper, type.getProperty(field));
- if (pkNames.contains(field)) {
- pkParams.add(p);
- } else {
- parameters.add(p);
- }
- }
- parameters.addAll(pkParams);
- return parameters;
-
- }
-
- private Parameter getParameter(TableWrapper wrapper, Property property) {
- Parameter param = new ParameterImpl();
- param.setName(property.getName());
- param.setType(property.getType());
- param.setConverter(getConverter(wrapper, property.getName()));
-
- return param;
- }
-}
-
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
deleted file mode 100644
index 2d58c0f269..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-
-public class DataObjectMaker {
-
- private final DataObject rootObject;
-
- private boolean debug = false;
-
- public DataObjectMaker(DataObject root) {
- this.rootObject = root;
- }
-
- /**
- * @param tableData
- * @return
- */
- public DataObject createAndAddDataObject(TableData tableData,
- ResultMetadata resultMetadata) {
- // Get a Type from the package and create a standalone DataObject
-
- DebugUtil.debugln(getClass(), this.debug, "Looking for Type for "
- + tableData.getTableName());
-
- Type tableClass = findTableTypeByPropertyName(tableData.getTableName());
-
- if (tableClass == null)
- throw new RuntimeException("An SDO Type with name "
- + tableData.getTableName() + " was not found");
-
- DataObject obj = DataFactory.INSTANCE.create(tableClass);
-
- // Now, check to see if the root data object has a containment reference
- // to this EClass. If so, add it to the graph. If not, it will be taken
- // care
- // of when we process relationships
-
- Iterator i = this.rootObject.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property p = (Property) i.next();
-
- if (p.isContainment() && p.getType().equals(tableClass)) {
- if (p.isMany())
- rootObject.getList(p).add(obj);
- // TODO This was a performance optimization for EMF in SDO 1.1,
- // check to see if there is
- // something equivalent in SDO 2.0
- // ((InternalEList) this.dataGraph.eGet(ref)).addUnique(obj);
- else
- this.rootObject.set(p, obj);
- }
-
- }
-
- Iterator columnNames = resultMetadata.getColumnNames(
- tableData.getTableName()).iterator();
- while (columnNames.hasNext()) {
- String columnName = (String) columnNames.next();
- DataObject dataObject = (DataObject) obj;
- Property p = findProperty(dataObject.getType(), columnName);
- Object value = tableData.getColumnData(columnName);
-
- dataObject.set(p, value);
- }
-
- return obj;
- }
-
- // temporary, ignoring case
- private Property findProperty(Type type, String columnName) {
- Iterator properties = type.getProperties().iterator();
- while (properties.hasNext()) {
- Property p = (Property) properties.next();
- if (columnName.equalsIgnoreCase(p.getName()))
- return p;
- }
- return null;
- }
-
- private Type findTableTypeByPropertyName(String tableName) {
- Iterator i = rootObject.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property p = (Property) i.next();
- // System.out.println(p.getType().getName());
- if (tableName.equals(p.getType().getName()))
- return p.getType();
- }
-
- return null;
- }
-
- private Type findTableTypeByRootReference(String refName) {
- return rootObject.getProperty(refName).getType();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
deleted file mode 100644
index 54c536d95c..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.sql.Blob;
-import java.sql.SQLException;
-
-import org.apache.tuscany.das.rdb.Converter;
-
-
-public class DefaultConverter implements Converter {
-
- public DefaultConverter() {
- super();
- }
-
- public Object getColumnValue(Object data) {
- return data;
- }
-
- public Object getPropertyValue(Object data) {
-// if (type.isInstance(data))
-// return data;
-//
-// if ( data == null )
-// return null;
-//
-// String name = type.getInstanceClass().getName();
-// if (name == "java.lang.Byte" || name == "byte") {
-// return new Byte(data.toString());
-// }
-//
-// else if (name == "java.lang.Double" || name == "double") {
-// return new Double(data.toString());
-// }
-//
-// else if (name == "java.lang.Float" || name == "float") {
-// return new Float(data.toString());
-// }
-//
-// else if (name == "java.lang.Integer" || name == "int") {
-// return new Integer(data.toString());
-// }
-//
-// else if (name == "java.lang.Long" || name == "long") {
-// return new Long(data.toString());
-// }
-//
-// else if (name == "java.lang.Short" || name == "short") {
-// return new Short(data.toString());
-// }
-//
-// else if (name == "java.lang.String") {
-// return String.valueOf(data.toString());
-// }
-
- if ( data instanceof Blob ) {
- Blob b = (Blob) data;
- try {
- return b.getBytes(1, (int)b.length());
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- } else {
- return data;
- }
-
-
-
-// else {
-//
-// throw new IllegalArgumentException("The database value of type "
-// + data.getClass().getName() + " must be converted to type "
-// + type.getInstanceClass().getName());
-// }
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
deleted file mode 100644
index e869c31bee..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.ResultSetShape;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.graphbuilder.schema.ESchemaMaker;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.Type;
-
-
-/**
- */
-public class GraphBuilderMetadata {
-
- private Config mappingModel;
- private final Collection resultSets = new ArrayList();
- private boolean debug = false;
- private Type schema;
-
-
- public GraphBuilderMetadata(Collection results, Type schema, Config model, ResultSetShape shape) throws SQLException {
- this.mappingModel = model;
- this.schema = schema;
-
- Iterator i = results.iterator();
- while (i.hasNext()) {
- ResultSet rs = (ResultSet) i.next();
- ResultMetadata resultMetadata = new ResultMetadata(rs, mappingModel, shape);
- resultSets.add(resultMetadata);
- }
-
- DebugUtil.debugln(getClass(), debug, "Mapping model: " + mappingModel);
- }
-
-
- public Collection getResultMetadata() {
- return this.resultSets;
- }
-
-
- public boolean hasMappingModel() {
- return mappingModel == null ? false : true;
- }
-
-
- /**
- * @return
- */
-
- public Collection getRelationships() {
- if (!hasMappingModel()) {
- DebugUtil.debugln(getClass(), debug, "No relationships to return");
- return Collections.EMPTY_LIST;
- }
-
- return mappingModel.getRelationship();
- }
-
-
- /**
- * @return
- */
- public Type getSchema() {
- if ( this.schema == null ) {
- ESchemaMaker schemaMaker = new ESchemaMaker(this);
- return schemaMaker.createESchema();
- } else {
- return this.schema;
- }
- }
-
- public Config getMapping() {
- return this.mappingModel;
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
deleted file mode 100644
index 142aee5c60..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-
-
-
-/**
- *
- * Used to store and look up table objects based on primary key
- * This could be a lot more efficient if we could use LinkedHashMap from JDK 1.4
- */
-public class MultiTableRegistry implements TableRegistry {
-
- private HashMap tableNameMap;
- private HashMap tableValueMap;
- private boolean debug = false;
-
-
- public MultiTableRegistry() {
- tableNameMap = new HashMap();
- tableValueMap = new HashMap();
- }
-
-
-
- /**
- * Get the table with the specified name and primary key
- * @param tableName
- * @param primaryKey
- * @return EDataObject
- */
- public DataObject get(String tableName, List primaryKey) {
- if ( debug ) {
- DebugUtil.debugln(getClass(), debug, "Looking for table " + tableName + " with PK " + primaryKey);
- DebugUtil.debugln(getClass(), debug, ("\tReturning " + getPkMap(tableName).get(primaryKey)));
- }
- return (DataObject) getPkMap(tableName).get(primaryKey);
- }
-
- /**
- * Add the table with the specified name and primary key
- * @param tableName
- * @param primaryKey
- * @param value
- */
- public void put(String tableName, List primaryKey, DataObject value) {
- if ( getPkMap(tableName).put(primaryKey, value) == null )
- getCreateValueList(tableName).add(value);
- }
-
- /**
- * Get the HashMap that contains the primary key to table object
- * mappings.
- * @param tableName
- * @return HashMap
- */
- private HashMap getPkMap(String tableName) {
- HashMap pkMap = (HashMap)tableNameMap.get(tableName);
- if ( pkMap == null ) {
- pkMap = new HashMap();
- tableNameMap.put(tableName, pkMap);
- }
- return pkMap;
- }
-
- private List getCreateValueList(String tableName) {
- List values = (List) tableValueMap.get(tableName);
- if ( values == null ) {
- values = new ArrayList();
- tableValueMap.put(tableName, values);
- }
- return values;
- }
-
-
-
- public boolean contains(String tableName, List primaryKey) {
- return get(tableName,primaryKey) == null ? false : true;
-
- }
-
-
-} \ No newline at end of file
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
deleted file mode 100644
index 42ac10eef6..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.ResultSetShape;
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.Type;
-
-public class ResultMetadata {
-
- private HashMap tableToColumnMap = new HashMap();
-
- private ArrayList tablePropertyNames = new ArrayList();
-
- private ArrayList columnPropertyNames = new ArrayList();
-
- private final ResultSet resultSet;
-
- private final ResultSetShape resultSetShape;
-
- private final MappingWrapper mappingWrapper;
-
- private Converter[] converters;
-
- private static boolean debug = false;
-
- public ResultMetadata(ResultSet rs, Config model, ResultSetShape shape)
- throws SQLException {
- debug("Creating new ResultMetadata with mapping model " + model);
- this.resultSet = rs;
- this.mappingWrapper = new MappingWrapper(model);
-
- if (shape == null)
- this.resultSetShape = new ResultSetShape(rs.getMetaData());
- else
- this.resultSetShape = shape;
-
- this.converters = new Converter[resultSetShape.getColumnCount()];
-
- for (int i = 1; i <= resultSetShape.getColumnCount(); i++) {
- String tableName = resultSetShape.getTableName(i);
-
- String tableProperty = mappingWrapper
- .getTablePropertyName(tableName);
- String columnProperty = mappingWrapper.getColumnPropertyName(
- tableName, resultSetShape.getColumnName(i));
- String converter = mappingWrapper.getConverter(tableName,
- resultSetShape.getColumnName(i));
- if (converter != null) {
- try {
- Converter convInstance = (Converter) Class.forName(
- converter).newInstance();
- converters[i - 1] = convInstance;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
-
- } else {
- // TODO make static
- converters[i - 1] = new DefaultConverter();
- }
- DebugUtil.debugln(getClass(), debug, "Adding table/column: "
- + tableProperty + "/" + columnProperty);
- tablePropertyNames.add(tableProperty);
- columnPropertyNames.add(columnProperty);
-
- Collection columns = (Collection) tableToColumnMap
- .get(tableProperty);
- if (columns == null)
- columns = new ArrayList();
- columns.add(columnProperty);
- tableToColumnMap.put(tableProperty, columns);
- }
-
- // Add any tables defined in the model but not included in the ResultSet
- // to the list of propertyNames
- if (model != null) {
- Iterator tablesFromModel = model.getTable().iterator();
- while (tablesFromModel.hasNext()) {
- TableWrapper t = new TableWrapper((Table) tablesFromModel
- .next());
- if (tableToColumnMap.get(t.getPropertyName()) == null)
- tableToColumnMap.put(t.getPropertyName(),
- Collections.EMPTY_LIST);
- }
- }
-
- if (debug) {
- DebugUtil.debugln(getClass(), debug, toString());
- DebugUtil
- .debugln(getClass(), debug, this.resultSetShape.toString());
- }
-
- }
-
- private void debug(Object string) {
- if (debug)
- DebugUtil.debugln(getClass(), debug, string);
- }
-
- public Collection getColumnNames() {
- return columnPropertyNames;
- }
-
- public String getColumnPropertyName(int i) {
- return (String) columnPropertyNames.get(i - 1);
- }
-
- public String getDatabaseColumnName(int i) {
- return resultSetShape.getColumnName(i);
- }
-
- public String getTableName(String columnName) {
- return (String) tablePropertyNames.get(columnPropertyNames
- .indexOf(columnName));
- }
-
- public int getTableSize(String tableName) {
- return ((Collection) tableToColumnMap.get(tableName)).size();
- }
-
- public Type getDataType(String columnName) {
- return resultSetShape.getColumnType(columnPropertyNames
- .indexOf(columnName));
- }
-
- public String getTablePropertyName(int i) {
- return (String) tablePropertyNames.get(i - 1);
- }
-
- public Collection getAllTablePropertyNames() {
- return tableToColumnMap.keySet();
- }
-
- public String toString() {
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (Table Names: ");
- Iterator i = tablePropertyNames.iterator();
- while (i.hasNext()) {
- String tableName = (String) i.next();
- result.append(' ');
- result.append(tableName);
- result.append(',');
- }
-
- result.append(" columnNames: ");
-
- i = columnPropertyNames.iterator();
- while (i.hasNext()) {
- String columnName = (String) i.next();
- result.append(' ');
- result.append(columnName);
- result.append(',');
- }
-
- result.append(" mappingModel: ");
- result.append(this.mappingWrapper.getConfig());
-
- result.append(" resultSet: ");
- result.append(resultSet);
-
- result.append(" resultSetSize: ");
- result.append(resultSetShape.getColumnCount());
- result.append(')');
- return result.toString();
-
- }
-
- /**
- * @return
- */
- public int getNumberOfTables() {
- return tableToColumnMap.keySet().size();
- }
-
- /**
- * Return whether the column at the given position is part of a primary key.
- * If we don't have this information, we assume every column is a primary
- * key. This results in uniqueness checks using all columns in a table.
- *
- * @param i
- * @return
- */
- public boolean isPKColumn(int i) {
- if (debug) {
- DebugUtil.debugln(getClass(), debug, "Checking to see if "
- + getColumnPropertyName(i) + " is a PK column in "
- + getTablePropertyName(i));
- }
- if (!hasMappingModel()) {
- if (debug)
- DebugUtil
- .debugln(getClass(), debug,
- "No mapping model exists, all columns will be considered PK columns");
- return true;
- } else {
- Table t = mappingWrapper.getTable(getTablePropertyName(i));
- if (t == null)
- return true;
- Column c = mappingWrapper.getColumn(t, getDatabaseColumnName(i));
-
- if (c == null)
- return false;
-
- if (c.isPrimaryKey())
- return true;
- }
- return false;
- }
-
- public boolean hasMappingModel() {
- return mappingWrapper.getConfig() == null ? false : true;
- }
-
- /**
- * @param i
- * @return
- */
- public Type getDataType(int i) {
- return resultSetShape.getColumnType(i);
- }
-
- /**
- * @param tableName
- * @return
- */
- public Collection getColumnNames(String tableName) {
- return (Collection) tableToColumnMap.get(tableName);
- }
-
- public ResultSet getResultSet() {
- return this.resultSet;
- }
-
- public int getResultSetSize() {
- return resultSetShape.getColumnCount();
- }
-
- public boolean isRecursive() {
- return mappingWrapper.hasRecursiveRelationships();
- }
-
- public Converter getConverter(int i) {
- return converters[i - 1];
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
deleted file mode 100644
index 8ccc0aee12..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-
-/**
- *
- * A ResultSetProcessor is used to transform the data in a ResultSet into a set
- * of inter-related EDataObjects.
- */
-public class ResultSetProcessor {
-
- private TableRegistry registry;
-
- private GraphBuilderMetadata metadata;
-
- private boolean debug = false;
-
- private final DataObjectMaker doMaker;
-
- public ResultSetProcessor(DataObject g, GraphBuilderMetadata gbmd) {
-
- this.metadata = gbmd;
- if (metadata.getRelationships().size() == 0)
- registry = new SingleTableRegistry();
- else
- registry = new MultiTableRegistry();
-
- doMaker = new DataObjectMaker(g);
-
- debug(metadata);
-
- }
-
- private void debug(Object output) {
- DebugUtil.debugln(getClass(), debug, output);
- }
-
- /**
- * Process the ResultSet. For each row in the ResultSet, a
- *
- * @link ResultSetRow object will be created to represent the row as a set
- * of EDataObjects. Then, the relevant relationships will be
- * constructed between each object in the
- * @link ResultSetRow.
- *
- * @param rs
- * The ResultSet
- */
- public void processResults(int start, int end) throws SQLException {
-
- Iterator i = metadata.getResultMetadata().iterator();
- while ( i.hasNext()) {
- ResultMetadata resultMetadata = (ResultMetadata)i.next();
- ResultSet results = resultMetadata.getResultSet();
-
- processResultSet(results, resultMetadata, start, end);
-
- //TODO These statements HAVE to be closed or we will have major problems
- //results.getStatement().close();
- results.close();
- }
-
- }
-
-
- private void processResultSet(ResultSet rs, ResultMetadata rsMetadata,
- int start, int end) throws SQLException {
-
- if ( rs.getType() == ResultSet.TYPE_FORWARD_ONLY) {
- while (rs.next() && start < end) {
- ResultSetRow rsr = new ResultSetRow(rs, rsMetadata);
- addRowToGraph(rsr, rsMetadata);
- ++start;
- }
- } else {
- while (rs.absolute(start) && start < end) {
- ResultSetRow rsr = new ResultSetRow(rs, rsMetadata);
- addRowToGraph(rsr, rsMetadata);
- ++start;
- }
- }
- }
-
- /**
- * @param row
- * @param resultMetadata
- */
- private void addRowToGraph(ResultSetRow row, ResultMetadata resultMetadata) {
- RowObjects tableObjects = new RowObjects(metadata, registry);
- Iterator tables = row.getAllTableData().iterator();
- while (tables.hasNext()) {
- TableData rawDataFromRow = (TableData) tables.next();
-
- if ( (resultMetadata.hasMappingModel()) && (!rawDataFromRow.hasValidPrimaryKey() ) )
- continue;
-
- String tableName = rawDataFromRow.getTableName();
- DataObject tableObject = registry.get(tableName, rawDataFromRow
- .getPrimaryKeyValues());
- if (tableObject == null) {
- tableObject = doMaker.createAndAddDataObject(rawDataFromRow, resultMetadata);
-
- debug("Putting table " + tableName + " with PK " + rawDataFromRow.getPrimaryKeyValues() + " into registry");
-
- registry.put(tableName, rawDataFromRow.getPrimaryKeyValues(),
- tableObject);
- }
- tableObjects.put(tableName, tableObject);
- }
-
- tableObjects.processRelationships();
-
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
deleted file mode 100644
index f68f48fc06..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-
-/**
- *
- * A ResultSetRow is used to transform a single row of a ResultSet into a set of
- * EDataObjects.
- */
-public class ResultSetRow {
-
- private final ResultMetadata metadata;
-
- private HashMap tableMap = new HashMap();
-
- private ArrayList allTableData;
-
- private boolean debug = false;
-
- /**
- * Method ResultSetRow.
- *
- * @param rs
- * A ResultSet positioned on the desired row
- * @param ePackage
- * The package used to create EDataObjects
- */
- public ResultSetRow(ResultSet rs, ResultMetadata m) throws SQLException {
- this.metadata = m;
- if (m.isRecursive())
- processRecursiveRow(rs);
- else
- processRow(rs);
- }
-
- /**
- * Processes a single row in the ResultSet Method processRow.
- *
- * @param rs
- */
- private void processRow(ResultSet rs) throws SQLException {
-
- DebugUtil.debugln(getClass(), debug, "");
- for (int i = 1; i <= metadata.getResultSetSize(); i++) {
- Object data = getObject(rs, i);
-
- TableData table = getRawData(metadata.getTablePropertyName(i));
- DebugUtil.debugln(getClass(), debug, "Adding column: "
- + metadata.getColumnPropertyName(i) + "\tValue: " + data
- + "\tTable: " + metadata.getTablePropertyName(i));
- table.addData(metadata.getColumnPropertyName(i), metadata
- .isPKColumn(i), data);
- }
-
- }
-
- public void processRecursiveRow(ResultSet rs) throws SQLException {
- this.allTableData = new ArrayList();
- int i = 1;
- DebugUtil.debugln(getClass(), debug, "");
- while (i <= metadata.getResultSetSize()) {
- DebugUtil.debugln(getClass(), debug, "");
- TableData table = new TableData(metadata.getTablePropertyName(i));
- this.allTableData.add(table);
-
- while ( (i <= metadata.getResultSetSize()) && (metadata.isPKColumn(i))) {
- Object data = getObject(rs, i);
- DebugUtil.debugln(getClass(), debug, "Adding column: "
- + metadata.getColumnPropertyName(i) + "\tValue: " + data
- + "\tTable: " + metadata.getTablePropertyName(i));
- table.addData(metadata.getColumnPropertyName(i), true, data);
- i++;
- }
-
- while ( (i <= metadata.getResultSetSize()) &&
- (!metadata.isPKColumn(i))) {
- Object data = getObject(rs, i);
- DebugUtil.debugln(getClass(), debug, "Adding column: "
- + metadata.getColumnPropertyName(i) + "\tValue: " + data
- + "\tTable: " + metadata.getTablePropertyName(i));
- table.addData(metadata.getColumnPropertyName(i), false, data);
- i++;
- }
- }
- }
-
- /**
- * @param rs
- * @param metadata
- * @param i
- * @return
- */
- private Object getObject(ResultSet rs, int i)
- throws SQLException {
-
- Object data = rs.getObject(i);
-
- if (rs.wasNull())
- return null;
- else
- return metadata.getConverter(i).getPropertyValue(data);
- }
-
- /**
- * Returns a HashMap that holds data for the specified table
- *
- * @param tableName
- * The name of the table
- * @return HashMap
- */
- public TableData getTable(String tableName) {
- return (TableData) tableMap.get(tableName);
- }
-
- /**
- * Returns a HashMap that holds data for the specified table If the HashMap
- * doesn't exist, it will be created. This is used internally to build the
- * ResultSetRow, whereas getTable is used externally to retrieve existing
- * table data.
- *
- * @param tableName
- * The name of the table
- * @return HashMap
- */
- private TableData getRawData(String tableName) {
-
- TableData table = (TableData) tableMap.get(tableName);
-
- if (table == null) {
- table = new TableData(tableName);
- tableMap.put(tableName, table);
- }
-
- return table;
- }
-
- public ArrayList getAllTableData() {
- if ( this.allTableData == null ) {
- this.allTableData = new ArrayList();
- this.allTableData.addAll(tableMap.values());
- }
- DebugUtil.debugln(getClass(), debug, allTableData);
-
- return this.allTableData;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
deleted file mode 100644
index f0df0ab7c3..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-
-public class RowObjects {
-
- private HashMap objectsByTableName;
-
- private ArrayList tableObjects;
-
- private static final boolean debug = false;
-
- private final GraphBuilderMetadata metadata;
-
- private final TableRegistry registry;
-
- public RowObjects(GraphBuilderMetadata metadata, TableRegistry registry) {
- objectsByTableName = new HashMap();
- tableObjects = new ArrayList();
- this.metadata = metadata;
- this.registry = registry;
- }
-
- public void put(String key, DataObject value) {
- objectsByTableName.put(key, value);
- tableObjects.add(value);
- }
-
- public DataObject get(String tablePropertyName) {
- return (DataObject) objectsByTableName.get(tablePropertyName);
- }
-
- void processRelationships() {
- MappingWrapper wrapper = new MappingWrapper(metadata.getMapping());
- if (wrapper.hasRecursiveRelationships()) {
- processRecursiveRelationships(wrapper);
- return;
- }
-
- Iterator i = metadata.getRelationships().iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
-
-
- DataObject parentTable = get(wrapper
- .getTablePropertyName(r.getPrimaryKeyTable()));
- DataObject childTable = get(wrapper
- .getTablePropertyName(r.getForeignKeyTable()));
-
- DebugUtil.debugln(getClass(), debug, "Parent table: " + parentTable);
- DebugUtil.debugln(getClass(), debug, "Child table: " + childTable);
-
- if ((parentTable == null) || (childTable == null))
- continue;
-
- Property p = parentTable.getType().getProperty(r.getName());
- setOrAdd(parentTable, childTable, p);
-
- }
- }
-
-
-
- private void processRecursiveRelationships(MappingWrapper wrapper) {
- Iterator i = tableObjects.iterator();
- while (i.hasNext()) {
- DataObject table = (DataObject) i.next();
-
- Iterator relationships = wrapper.getRelationshipsByChildTable(table.getType().getName()).iterator();
- while ( relationships.hasNext() ) {
- Relationship r = (Relationship) relationships.next();
-
- DataObject parentTable = findParentTable(table, r, wrapper);
-
- if (parentTable == null)
- continue;
-
- Property p = parentTable.getType().getProperty(r.getName());
- setOrAdd(parentTable, table, p);
- }
-
- }
- }
-
- private void setOrAdd(DataObject parent, DataObject child, Property p) {
- if (p.isMany()) {
- parent.getList(p).add(child);
- } else {
- parent.set(p, child);
- }
- }
-
- private DataObject findParentTable(DataObject childTable,
- Relationship r, MappingWrapper wrapper) {
-
- ArrayList fkValue = new ArrayList();
- Iterator keyPairs = r.getKeyPair().iterator();
- while (keyPairs.hasNext()) {
- KeyPair pair = (KeyPair) keyPairs.next();
- String childProperty = wrapper.getColumnPropertyName(r.getPrimaryKeyTable(), pair.getForeignKeyColumn());
-
- Property p = childTable.getType().getProperty(childProperty);
- fkValue.add(childTable.get(p));
- }
-
- DebugUtil.debugln(getClass(), debug, "Trying to find parent of " + r.getForeignKeyTable() + " with FK "
- + fkValue);
- DataObject parentTable = registry.get(r.getPrimaryKeyTable(), fkValue);
- DebugUtil.debugln(getClass(), debug, "Parent table from registry: " + parentTable);
- return parentTable;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
deleted file mode 100644
index f00ef2770d..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.List;
-
-import commonj.sdo.DataObject;
-
-/**
- */
-public class SingleTableRegistry implements TableRegistry {
-
- //private HashMap<List,DataObject> values = new HashMap<List,DataObject>();
-
- public SingleTableRegistry() {
- // Empty Constructor
- }
-
- /* (non-Javadoc)
- * @see com.ibm.ws.sdo.mediator.jdbc.graphbuilder.impl.TableRegistry#get(java.lang.String, java.util.List)
- */
- public DataObject get(String tableName, List primaryKey) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see com.ibm.ws.sdo.mediator.jdbc.graphbuilder.impl.TableRegistry#put(java.lang.String, java.util.List, java.lang.Object)
- */
- public void put(String tableName, List primaryKey, DataObject value) {
- // do nothing
-
- }
-
- public boolean contains(String name, List list) {
- return false;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
deleted file mode 100644
index 48b6dc0187..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-
-/**
- *
- */
-public class TableData {
-
- private HashMap columnData = new HashMap();
- private ArrayList primaryKey = new ArrayList();
- private final String name;
- private boolean hasValidPrimaryKey = true;
- private static final boolean debug = false;
-
- public TableData(String tableName) {
- DebugUtil.debugln(getClass(), debug, "Creating TableData for table " + tableName);
- this.name = tableName;
- }
-
-
- public void addData(String columnName, boolean isPrimaryKeyColumn, Object data) {
- DebugUtil.debugln(getClass(), debug, "Adding column " + columnName + " with value " + data);
- columnData.put(columnName, data);
- if ( isPrimaryKeyColumn ) {
- if ( data == null ) {
- DebugUtil.debugln(getClass(), debug, "Column " + columnName + " is a primary key column and is null");
- hasValidPrimaryKey = false;
- }
- primaryKey.add(data);
- }
- }
-
- public Object getColumnData(String columnName) {
- return columnData.get(columnName);
- }
-
- public String getTableName() {
- return this.name;
- }
-
-
- /**
- * @return
- */
- public List getPrimaryKeyValues() {
- return primaryKey;
- }
-
-
- public boolean hasValidPrimaryKey() {
- return hasValidPrimaryKey;
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
deleted file mode 100644
index 4b5a3677ae..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.impl;
-
-import java.util.List;
-
-import commonj.sdo.DataObject;
-
-/**
- */
-public interface TableRegistry {
- /**
- * Get the table with the specified name and primary key
- * @param tableName
- * @param primaryKey
- * @return EDataObject
- */
- public DataObject get(String tableName, List primaryKey);
-
- /**
- * Add the table with the specified name and primary key
- * @param tableName
- * @param primaryKey
- * @param value
- */
- public void put(String tableName, List primaryKey, DataObject value);
-
- public boolean contains(String name, List list);
-} \ No newline at end of file
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EAttributeMaker.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EAttributeMaker.java
deleted file mode 100644
index bb26ac51c3..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EAttributeMaker.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.schema;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.DataTypeImpl;
-
-import commonj.sdo.Type;
-
-
-/**
- *
- * A helper used to create new EAttributes
- */
-public class EAttributeMaker {
-
- private static EAttributeMaker maker;
-
- protected EAttributeMaker() {
- // Empty Constructor
- }
-
- /**
- * Return an EAttributeMaker singleton
- * @return EAttributeMaker
- */
- public static EAttributeMaker singleton() {
- if (maker == null)
- maker = new EAttributeMaker();
- return maker;
- }
-
- /**
- * Create a new EAttribute with the specified name and type
- * @param name The name of the new EAttribute
- * @param type The type of the new EAttribute
- * @return EAttribute
- */
- public AttributeImpl createEAttribute(String name, Type type) {
-
- AttributeImpl attr = (AttributeImpl) getFactory().createAttribute();
- attr.setName(name);
- attr.setEType((DataTypeImpl)type);
- attr.setUnique(false);
-
- return attr;
- }
-
- private SDOFactory getFactory() {
- return SDOFactory.eINSTANCE;
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EReferenceMaker.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EReferenceMaker.java
deleted file mode 100644
index 480f5d1bdd..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/EReferenceMaker.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.graphbuilder.schema;
-
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-
-import commonj.sdo.Type;
-
-/**
- * A helper used to create EReferences
- */
-public class EReferenceMaker {
-
- public EReferenceMaker() {
- // Empty Constructor
- }
-
- /**
- * Create an EReference with the specified name, type, lower bound, upper bound
- * and containment.
- * @param name
- * @param type
- * @param lowerBound
- * @param upperBound
- * @param containment
- * @return EReference
- */
- public ReferenceImpl createReference(String name, Type type, int lowerBound, int upperBound, boolean containment, boolean changeable) {
- ReferenceImpl ref = (ReferenceImpl) getFactory().createReference();
- ref.setName(name);
- ref.setEType((ClassImpl)type);
- ref.setLowerBound(lowerBound);
- ref.setUpperBound(upperBound);
- ref.setContainment(containment);
- ref.setResolveProxies(false);
- ref.setChangeable(changeable);
-
- return ref;
- }
-
- public ReferenceImpl createReference(String name, Type type, int lowerBound, int upperBound, boolean containment) {
- return createReference(name, type, lowerBound, upperBound, containment, true);
- }
- /**
- * Create a one to many reference with the specified name, type, and containment
- * @param name
- * @param type
- * @param containment
- * @return
- */
- public ReferenceImpl createOneToManyReference(String name, Type type, boolean containment) {
- return createReference(name, type, 0, -1, containment);
- }
-
- /**
- * Create a one to many reference with the specified name and type
- * @param name
- * @param type
- * @return EReference
- */
- public ReferenceImpl createOneToManyReference(String name, Type type) {
- return createOneToManyReference(name, type, false);
- }
-
- /**
- * Create a one to one reference with the specified name and type
- * @param name
- * @param type
- * @return EReference
- */
- public ReferenceImpl createOneToOneReference(String name, Type type) {
- ReferenceImpl ref = createReference(name, type,0,1,false);
- return ref;
- }
-
- /**
- * Create a many to one reference with the specified name and type
- * @param name
- * @param type
- * @return EReference
- */
- public ReferenceImpl createManyToOneReference(String name, Type type) {
- return createReference(name,type,0,1,false);
- }
-
- private SDOFactory getFactory() {
- return SDOFactory.eINSTANCE;
- }
-
-
- /**
- * @param r
- * @param parent
- * @param child
- * @return
- */
- public ReferenceImpl createReference(Relationship r, Type parent, Type child) {
- if ( !r.isMany() ) {
- ReferenceImpl ref = createOneToOneReference(r.getName(), child);
- ReferenceImpl opp = createOneToOneReference(r.getName() + "_opposite", parent);
- ref.setEOpposite(opp);
- opp.setEOpposite(ref);
- return ref;
- } else {
- ReferenceImpl ref = createOneToManyReference(r.getName(), child);
- ReferenceImpl opp = createManyToOneReference(r.getName() + "_opposite", parent);
- ref.setEOpposite(opp);
- opp.setEOpposite(ref);
- return ref;
- }
-
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
deleted file mode 100644
index 5b1a300736..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.schema;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultMetadata;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.apache.tuscany.sdo.impl.DynamicDataObjectImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- *
- * An ESchemaMaker is used to create an EMF Schema from an instance of JDBC
- * Mediator Metadata.
- *
- */
-public class ESchemaMaker {
-
- private final GraphBuilderMetadata metadata;
-
- private EPackage dataGraphPackage;
-
- private final String nsPrefix;
-
- private final String pkgName;
-
- private boolean debug = false;
-
- /**
- * Constructor for ESchemaMaker. Creates an EMF Schema based on the metadata
- * passed in.
- *
- * @param metadata
- */
- public ESchemaMaker(GraphBuilderMetadata metadata) {
- this(metadata, null, null);
- }
-
- /**
- * Constructor for ESshemaMaker. Creates an EMF Schema based on the supplied
- * metadata, namespace prefix, and package name
- *
- * @param metadata
- * the metadata
- * @param nsPrefix
- * the namespace prefix - this affects the generated
- * Factory/Package name - defaults to datagraph
- * @param pkgName
- * the package name - determines package name for generated code -
- * defaults to datagraph
- */
- public ESchemaMaker(GraphBuilderMetadata metadata, String nsPrefix,
- String pkgName) {
- if (nsPrefix == null)
- nsPrefix = "datagraph";
- if (pkgName == null)
- pkgName = "datagraph";
-
- this.metadata = metadata;
- this.nsPrefix = nsPrefix;
- this.pkgName = pkgName;
-
- TypeHelper helper = TypeHelper.INSTANCE;
- }
-
- /**
- * Creates an EMF Schema by using the
- *
- * @link TableMaker and
- * @link RelationshipMaker to transform
- * @link Metadata elements into EMF Schema elements.
- */
-
- public Type createESchema() {
- TypeHelper.INSTANCE.getType("commonj.sdo", "Integer");
- DataObjectUtil.initRuntime();
- SDOUtil.createDataGraph();
-
- ClassImpl rootClass = (ClassImpl) SDOFactory.eINSTANCE.createClass();
- Type rootType = (Type) rootClass;
-
- rootClass.setName("DataGraphRoot");
- getEPackage().getEClassifiers().add(rootClass);
-
- EReferenceMaker refMaker = new EReferenceMaker();
-
- Iterator iter = metadata.getResultMetadata().iterator();
- while (iter.hasNext()) {
-
- ResultMetadata resultMetadata = (ResultMetadata) iter.next();
-
- Iterator names = resultMetadata.getAllTablePropertyNames()
- .iterator();
- while (names.hasNext()) {
- String tableName = (String) names.next();
- if (rootClass.getEStructuralFeature(tableName) == null) {
- Type clazz = createType(tableName);
- getEPackage().getEClassifiers().add(clazz);
- ReferenceImpl ref = refMaker.createOneToManyReference(
- tableName, clazz, true);
- rootClass.getEStructuralFeatures().add(ref);
- }
- }
-
- for (int i = 1; i <= resultMetadata.getColumnNames().size(); i++) {
-
- ReferenceImpl ref = (ReferenceImpl) rootType
- .getProperty(resultMetadata.getTablePropertyName(i));
-
- if (ref == null)
- throw new RuntimeException("Could not find table "
- + resultMetadata.getTablePropertyName(i)
- + " in the SDO model");
- EClass clazz = ref.getEReferenceType();
- String columnName = resultMetadata.getColumnPropertyName(i);
-
- if (clazz.getEStructuralFeature(columnName) == null) {
- Type atype = (Type) resultMetadata.getDataType(i);
-
- // EDataType type = (EDataType) atype.getEClassifier();
-
- AttributeImpl attr = getAttributeMaker().createEAttribute(
- columnName, atype);
-
- DebugUtil.debugln(getClass(), debug, "Adding column "
- + columnName + " to "
- + resultMetadata.getTablePropertyName(i));
- clazz.getEStructuralFeatures().add(attr);
- }
- }
- }
-
- if (metadata.hasMappingModel()) {
- MappingWrapper wrapper = new MappingWrapper(metadata.getMapping());
- Iterator i = metadata.getRelationships().iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
-
- EClass parent = (EClass) getEPackage().getEClassifier(
- wrapper.getTablePropertyName(r.getPrimaryKeyTable()));
- EClass child = (EClass) getEPackage().getEClassifier(
- wrapper.getTablePropertyName(r.getForeignKeyTable()));
- if (parent == null) {
- throw new RuntimeException("The parent table ("
- + r.getPrimaryKeyTable() + ") in relationship "
- + r.getName()
- + " was not found in the mapping information.");
- } else if (child == null) {
- throw new RuntimeException("The child table ("
- + r.getForeignKeyTable() + ") in relationship "
- + r.getName()
- + " was not found in the mapping information.");
- }
-
- ReferenceImpl ref = refMaker.createReference(r, (Type)parent, (Type)child);
-
- DebugUtil.debugln(getClass(), debug, "Adding reference: "
- + ref.getName() + " to " + parent.getName());
- if (parent.getEStructuralFeature(ref.getName()) == null)
- parent.getEStructuralFeatures().add(ref);
-
- if (child.getEStructuralFeature(ref.getEOpposite().getName()) == null)
- child.getEStructuralFeatures().add(ref.getEOpposite());
-
- }
-
- }
-
- // EcoreUtil.freeze(rootObject.getEPackage());
-
- return (Type) rootClass;
- }
-
- /**
- * Create an EClass with the specified name
- *
- * @param name
- * @return EClass
- */
- protected Type createType(String name) {
- ClassImpl ecl = (ClassImpl) SDOFactory.eINSTANCE.createClass();
- ecl.setName(name);
-
- return ecl;
- }
-
- /**
- * Get an EAttributeMaker singleton
- *
- * @return EAttributeMaker
- */
- private EAttributeMaker getAttributeMaker() {
- return EAttributeMaker.singleton();
- }
-
-
- /**
- * @return the EPackage for this schema
- */
- public EPackage getEPackage() {
- if (this.dataGraphPackage == null)
- this.dataGraphPackage = createEPackage();
- return this.dataGraphPackage;
- }
-
- /**
- * Create the EPackage for this schema Uses the packageName and nsPrefix
- * values set in the constructors The EPackage overrides the default
- * EFactory so that DataObjects will be created using MapDataObjectImpl.
- *
- * @return the new EPackage
- */
- protected EPackage createEPackage() {
-
- EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
- pkg.setName(pkgName);
- pkg.setNsPrefix(nsPrefix);
- pkg.setNsURI("datagraph.ecore");
-
- pkg.setEFactoryInstance(new EFactoryImpl() {
- public EObject basicCreate(EClass cls) {
- EObject result = new DynamicDataObjectImpl(cls);
- return result;
- }
- });
-
- return pkg;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
deleted file mode 100644
index 3fcccf6fca..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.graphbuilder.schema;
-
-import java.sql.Types;
-
-import org.apache.tuscany.sdo.SDOPackage;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- */
-public class ResultSetTypeMap {
-
- public static ResultSetTypeMap instance = new ResultSetTypeMap();
-
- /**
- * Constructor for ResultSetTypeMap.
- */
- protected ResultSetTypeMap() {
- // Empty Constructor
- }
-
- /**
- * These mappings taken primarily from "JDBC API and Tutorial and Reference" by
- * Fisher, Ellis and Bruce.
- *
- * @param type
- * @param isNullable
- * @return
- */
- public Type getEDataType(int type, boolean isNullable) {
-
- TypeHelper helper = TypeHelper.INSTANCE;
- SDOPackage.eINSTANCE.eClass();
- switch (type) {
-
- case Types.CHAR:
- case Types.VARCHAR:
- case Types.LONGVARCHAR:
- return helper.getType("commonj.sdo", "String");
-
- case Types.NUMERIC:
- case Types.DECIMAL:
- return helper.getType("commonj.sdo", "Decimal");
-
- case Types.BIT:
- case Types.BOOLEAN:
- if (isNullable)
- return helper.getType("commonj.sdo", "Boolean");
- else
- return helper.getType("commonj.sdo", "boolean");
-
- case Types.TINYINT:
- case Types.SMALLINT:
- case Types.INTEGER:
- if (isNullable) {
- return helper.getType("commonj.sdo", "IntObject");
- } else
- return helper.getType("commonj.sdo", "Int");
-
- case Types.BIGINT:
- if (isNullable)
- return helper.getType("commonj.sdo", "Long");
- else
- return helper.getType("commonj.sdo", "long");
-
- case Types.REAL:
- if (isNullable)
- return helper.getType("commonj.sdo", "Real");
- else
- return helper.getType("commonj.sdo", "real");
-
- case Types.FLOAT:
- case Types.DOUBLE:
- if (isNullable)
- return helper.getType("commonj.sdo", "Double");
- else
- return helper.getType("commonj.sdo", "double");
-
- case Types.BINARY:
- case Types.VARBINARY:
- case Types.LONGVARBINARY:
- return helper.getType("commonj.sdo", "ByteArray");
-
- case Types.DATE:
- case Types.TIME:
- case Types.TIMESTAMP:
- return helper.getType("commonj.sdo", "Date");
-
- case Types.CLOB:
- return helper.getType("commonj.sdo", "Clob");
-
- case Types.BLOB:
- return helper.getType("commonj.sdo", "Blob");
-
- case Types.ARRAY:
- return helper.getType("commonj.sdo", "Array");
-
- case Types.DISTINCT:
- case Types.STRUCT:
- case Types.REF:
- case Types.DATALINK:
- case Types.JAVA_OBJECT:
- return helper.getType("commonj.sdo", "Object");
-
- default:
- return helper.getType("commonj.sdo", "Object");
- }
-
- }
-
-
- public Type getType(int columnType, boolean b) {
- return getEDataType(columnType, b);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
deleted file mode 100644
index 6e92a5e6a2..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.DriverManager;
-
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Key;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-/**
- *
- */
-public class ApplyChangesCommandImpl implements ApplyChangesCommand {
-
- private ConnectionImpl dasConnection;
-
- private static final boolean debug = false;
-
- private ChangeSummarizer summarizer = new ChangeSummarizer();
-
- public ApplyChangesCommandImpl() {
- // Empty Constructor
- }
-
- // IOException is recoverable, needs to be thrown
- public ApplyChangesCommandImpl(InputStream mappingModel) throws IOException {
- setMapping(mappingModel);
- }
-
- public ApplyChangesCommandImpl(Config mappingModel){
- summarizer.setMapping(mappingModel);
-//TODO - Really need to refactor the Command framework. ReadCommand and ApplychangesCommand should
-// be using the same approach to set connection and should probably share the same initialization.
-// if (mappingModel.getConnectionProperties() != null)
-// setConnection(mappingModel.getConnectionProperties());
- }
-
- public void setConnection(Connection connection) {
- setConnection(new ConnectionImpl(connection));
- }
-
- public void setConnection(Connection connection, boolean manageTransaction) {
- ConnectionImpl c = new ConnectionImpl(connection);
- c.setManageTransactions(manageTransaction);
- setConnection(c);
- }
-
- public void setConnection(ConnectionImpl connection) {
- dasConnection = connection;
- summarizer.setConnection(connection);
- }
-
- public void setConnection(ConnectionProperties c) {
- try {
- Connection connection = null;
- Class.forName(c.getDriverClassName());
- if (c.getDriverUserName() == null)
- connection = DriverManager.getConnection(c.getDriverURL());
- else
- connection = DriverManager.getConnection(c.getDriverURL(), c.getDriverUserName(), c.getDriverPassword());
- connection.setAutoCommit(false);
- setConnection(connection);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- public void addCreateCommand(Type type, Command cmd) {
- summarizer.addCreateCommand(type, cmd);
- ((CommandImpl) cmd).setConnection(dasConnection);
- }
-
- public void addUpdateCommand(Type type, Command cmd) {
- // DebugUtil.debugln(getClass(), debug, "Adding update command for type
- // " + type.getName());
- summarizer.addUpdateCommand(type, cmd);
- ((CommandImpl) cmd).setConnection(dasConnection);
- }
-
- public void addDeleteCommand(Type type, Command cmd) {
- summarizer.addDeleteCommand(type, cmd);
- ((CommandImpl) cmd).setConnection(dasConnection);
- }
-
- public void execute(DataObject root) {
- DebugUtil.debugln(getClass(), debug, "Executing ApplyChangesCmd");
-
- if (dasConnection == null)
- throw new RuntimeException("A connection must be provided");
-
- if (!root.equals(root.getDataGraph().getRootObject()))
- throw new RuntimeException("'root' argument must be the root of the datagraph");
-
- Changes changes = summarizer.loadChanges(root);
-
- boolean success = false;
- try {
- changes.execute();
- success = true;
- } finally {
- if (success)
- dasConnection.cleanUp();
- else
- dasConnection.errorCleanUp();
- }
- }
-
- public void setMapping(InputStream stream) throws IOException {
- XMLHelper helper = XMLHelper.INSTANCE;
-
- ConfigPackageImpl impl = ConfigPackageImpl.eINSTANCE;
- XMLDocument doc = helper.load(stream);
- Config mapping = (Config) doc.getRootObject();
-
- summarizer.setMapping(mapping);
- if (mapping.getConnectionProperties() != null)
- setConnection(mapping.getConnectionProperties());
-
- }
-
- public void addRelationship(String parent, String child) {
- summarizer.addRelationship(parent, child);
- }
-
- public void addPrimaryKey(String columnName) {
- summarizer.addPrimaryKey(columnName);
- }
-
- public void addCollisionColumn(String columnName) {
- summarizer.addCollisionColumn(columnName);
- }
-
- public void addRelationship(Key parentKey, Key childKey) {
- throw new RuntimeException("Not Implemented");
- }
-
- public void addPrimaryKey(Key key) {
- summarizer.addPrimarykey(key);
- }
-
- public void addGeneratedPrimaryKey(String columnName) {
- summarizer.addGeneratedPrimaryKey(columnName);
- }
-
- public void addConverter(String name, String converterName) {
- summarizer.addConverter(name, converterName);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
deleted file mode 100644
index 8e668c04ee..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.SDODataTypes;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.generator.impl.CudGenerator;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-public class ChangeFactory {
-
- private final Type type;
-
- private InsertCommandImpl createCommand;
-
- private WriteCommandImpl updateCommand;
-
- private WriteCommandImpl deleteCommand;
-
- private static final boolean debug = false;
-
- private CudGenerator cudGenerator;
-
- private final MappingWrapper mapping;
-
- private final ConnectionImpl connection;
-
- public ChangeFactory(Type type, MappingWrapper mapping, ConnectionImpl connection) {
- this.type = type;
- this.mapping = mapping;
- this.connection = connection;
- }
-
- public Type getType() {
- return this.type;
- }
-
- public void setCreateCommand(InsertCommandImpl cmd) {
- createCommand = cmd;
- }
-
- public void setUpdateCommand(WriteCommandImpl cmd) {
- DebugUtil.debugln(getClass(), debug, "Setting Update Command to " + cmd);
- updateCommand = cmd;
- }
-
- public void setDeleteCommand(WriteCommandImpl cmd) {
- deleteCommand = cmd;
- }
-
- private CudGenerator getCudGenerator() {
- if (this.cudGenerator == null)
- this.cudGenerator = new CudGenerator();
- return this.cudGenerator;
- }
-
- ChangeOperation createUpdateOperation(DataObject changedObject, String propagatedID) {
- return new UpdateOperation(getUpdateCommand(changedObject), changedObject, propagatedID);
- }
- ChangeOperation createUpdateOperation(DataObject changedObject) {
- return createUpdateOperation(changedObject, null);
- }
-
- ChangeOperation createDeleteOperation(DataObject changedObject) {
- return new DeleteOperation(getDeleteCommand(changedObject), changedObject);
- }
-
- ChangeOperation createInsertOperation(DataObject changedObject, String propagatedID) {
- return new CreateOperation(getCreateCommand(changedObject), changedObject, propagatedID);
- }
-
- ChangeOperation createInsertOperation(DataObject changedObject) {
- return createInsertOperation(changedObject, null);
- }
-
-
- private InsertCommandImpl getCreateCommand(DataObject changedObject) {
-
- if ( createCommand == null ) {
- Table table = mapping.getTable(changedObject.getType().getName());
- if (table == null )
- throw new RuntimeException("Table " + table + " was changed in the DataGraph but is not present in the Config");
-
- String createStatement = table.getCreate();
- if ( createStatement == null ) {
- createCommand = getCudGenerator().getInsertCommand(mapping, changedObject, table);
- } else {
- createCommand = new InsertCommandImpl(createStatement);
- Iterator i = getCudGenerator().getCreateParameters(mapping, changedObject, table).iterator();
- while (i.hasNext()) {
- Property p = (Property)i.next();
- createCommand.addParameter(p.getName(), p.getType());
- }
- }
- createCommand.setConnection(connection);
- createCommand.mappingModel = mapping;
- }
- return createCommand;
- }
-
- private WriteCommandImpl getDeleteCommand(DataObject changedObject) {
-
- if ( deleteCommand == null ) {
- Table table = mapping.getTable(changedObject.getType().getName());
- if (table == null )
- throw new RuntimeException("Table " + table + " was changed in the DataGraph but is not present in the Config");
- String deleteStatement = table.getDelete();
- if ( deleteStatement == null ) {
- deleteCommand = getCudGenerator().getDeleteCommand(table);
- } else {
- deleteCommand = new DeleteCommandImpl(deleteStatement);
- Iterator i = getCudGenerator().getDeleteParameters(table).iterator();
- while (i.hasNext()) {
- deleteCommand.addParameter((String)i.next(), SDODataTypes.OBJECT);
- }
- }
- deleteCommand.setConnection(connection);
- }
- return deleteCommand;
- }
-
- private WriteCommandImpl getUpdateCommand(DataObject changedObject) {
-
- if ( updateCommand == null ) {
- Table table = mapping.getTableByPropertyName(changedObject.getType().getName());
- if (table == null )
- throw new RuntimeException("Table " + table + " was changed in the DataGraph but is not present in the Config");
- String updateStatement = table.getUpdate();
- if ( updateStatement == null ) {
- updateCommand = getCudGenerator().getUpdateCommand(mapping, changedObject,table);
- } else {
- TableWrapper t = new TableWrapper(table);
- if ( t.getCollisionColumn() != null )
- updateCommand = new OptimisticWriteCommandImpl(updateStatement);
- else
- updateCommand = new UpdateCommandImpl(updateStatement);
-
-
- updateCommand.addParameters(getCudGenerator().getUpdateParameters(changedObject, table));
-
- }
- updateCommand.setConnection(connection);
- updateCommand.mappingModel = mapping;
- }
- DebugUtil.debugln(getClass(), debug, "Returning updateCommand: " + updateCommand);
- return updateCommand;
- }
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
deleted file mode 100644
index 0e8acac35b..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-
-/**
- */
-public abstract class ChangeOperation {
-
- private final WriteCommandImpl writeCommand;
-
- protected DatabaseObject dObject;
-
- private static final boolean debug = false;
-
- protected String propagatedID = null;
-
- public ChangeOperation(WriteCommandImpl command) {
- writeCommand = command;
- }
-
- public ChangeOperation(WriteCommandImpl command, DataObject changedObject) {
- writeCommand = command;
- dObject = new DatabaseObject(command.getMappingModel(), changedObject);
- }
-
- public void execute() {
- DebugUtil.debugln(getClass(), debug, "Executing change operation");
-
- Iterator i = writeCommand.getParameters().iterator();
- while (i.hasNext()) {
- Parameter parm = (Parameter) i.next();
- DebugUtil.debugln(getClass(), debug, "setting " + parm.getName() + " to " + dObject.get(parm.getName()));
- parm.setValue(dObject.get(parm.getName()));
- }
-
- writeCommand.execute();
- //TODO - Added this instanceof hack. Brent to verify
- if (( propagatedID != null ) && (writeCommand instanceof InsertCommandImpl)){
- DebugUtil.debugln(getClass(), debug, "Propagating key " + propagatedID);
- int id = writeCommand.getGeneratedKey();
- dObject.setPropagatedID(propagatedID, id);
- }
- }
-
- public String getTableName() {
- return dObject.getTableName();
- }
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
deleted file mode 100644
index a30a146f53..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Key;
-import org.apache.tuscany.das.rdb.config.Column;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.Table;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.impl.ChangeSummarySettingImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-
-public class ChangeSummarizer {
-
- private static final boolean debug = false;
-
- private Changes changes = new Changes();
-
- private FactoryRegistry registry;
-
- private MappingWrapper mapping = new MappingWrapper();
-
- private ConnectionImpl connection;
-
- private HashMap generatedKeys = new HashMap();
-
- public ChangeSummarizer() {
- // Empty Constructor
- }
-
- public Changes loadChanges(DataObject root) {
- ChangeSummary changeSummary = root.getDataGraph().getChangeSummary();
- if (changeSummary.isLogging())
- ((ChangeSummaryImpl) changeSummary).summarize();
-
- List changedObjects = changeSummary.getChangedDataObjects();
- DebugUtil.debugln(getClass(), debug,
- "List of changed objects contains " + changedObjects.size()
- + " object(s)");
-
- changes.setInsertOrder(mapping.getInsertOrder());
- changes.setDeleteOrder(mapping.getDeleteOrder());
-
- Iterator i = changedObjects.iterator();
- while (i.hasNext()) {
- DataObject o = (DataObject) i.next();
-
- if (!(o.equals(root))) {
- createChange(changeSummary, o);
- }
- }
-
- return changes;
- }
-
- public void createChange(ChangeSummary changeSummary,
- DataObject changedObject) {
-
- if (changeSummary.isCreated(changedObject)) {
- DebugUtil.debugln(getClass(), debug, "Change is a create");
- if (!changeSummary.isDeleted(changedObject)) {
- ChangeFactory factory = getRegistry().getFactory(
- changedObject.getType());
- String propagatedID = (String) generatedKeys.get(changedObject
- .getType().getName());
- changes.addInsert(factory.createInsertOperation(changedObject,
- propagatedID));
- }
- } else if (changeSummary.isDeleted(changedObject)) {
- ChangeFactory factory = getRegistry().getFactory(
- changedObject.getType());
- DebugUtil.debugln(getClass(), debug, "Change is a delete");
- changes.addDelete(factory.createDeleteOperation(changedObject));
- } else {
- // bumpCollisionField(changedObject);
- DebugUtil.debugln(getClass(), debug, "Change is a modify");
- List attrList = changeSummary.getOldValues(changedObject);
- if (hasAttributeChange(attrList)) {
- ChangeFactory factory = getRegistry().getFactory(
- changedObject.getType());
- DebugUtil.debugln(getClass(), debug, "Attribute Change for "
- + changedObject.getType().getName());
- String propagatedID = (String) generatedKeys.get(changedObject
- .getType().getName());
- changes.addUpdate(factory.createUpdateOperation(changedObject,
- propagatedID));
- } else {
- // Reference change
- List values = changeSummary.getOldValues(changedObject);
- Iterator i = values.iterator();
- while (i.hasNext()) {
- ChangeSummarySettingImpl setting = (ChangeSummarySettingImpl) i
- .next();
-
- if (setting.getFeature() instanceof ReferenceImpl) {
- DebugUtil.debugln(getClass(), debug,
- "Reference change for "
- + changedObject.getType().getName());
-
- ReferenceImpl ref = (ReferenceImpl) setting.getFeature();
-
- DebugUtil.debugln(getClass(), debug, ref.getName());
- if (ref.getEOpposite().isMany()) {
- ChangeFactory factory = getRegistry().getFactory(
- changedObject.getType());
- changes.addUpdate(factory
- .createUpdateOperation(changedObject));
- }
-
- }
- }
- }
- }
-
- }
-
- private boolean hasAttributeChange(List theChanges) {
- Iterator i = theChanges.iterator();
- while (i.hasNext()) {
- ChangeSummarySettingImpl setting = (ChangeSummarySettingImpl) i.next();
- if (setting.getFeature() instanceof AttributeImpl)
- return true;
- }
- return false;
- }
-
- public void addCreateCommand(Type type, Command cmd) {
- ChangeFactory cf = getRegistry().getFactory(type);
- cf.setCreateCommand((InsertCommandImpl) cmd);
- }
-
- public void addUpdateCommand(Type type, Command cmd) {
- ChangeFactory cf = getRegistry().getFactory(type);
- cf.setUpdateCommand((WriteCommandImpl) cmd);
- }
-
- public void addDeleteCommand(Type type, Command cmd) {
- ChangeFactory cf = getRegistry().getFactory(type);
- cf.setDeleteCommand((WriteCommandImpl) cmd);
-
- }
-
- private FactoryRegistry getRegistry() {
- if (this.registry == null) {
- this.registry = new FactoryRegistry(mapping, connection);
- }
- return this.registry;
- }
-
- public void setConnection(ConnectionImpl connection) {
- this.connection = connection;
- }
-
- public void setMapping(Config map) {
- this.mapping = new MappingWrapper(map);
- Iterator i = mapping.getConfig().getTable().iterator();
- while (i.hasNext()) {
- Table t = (Table) i.next();
- Iterator columns = t.getColumn().iterator();
- while ( columns.hasNext()) {
- Column c = (Column) columns.next();
- if ( c.isPrimaryKey() && c.isGenerated()) {
- DebugUtil.debugln(getClass(), debug, "adding generated key "
- + t.getName() + "."
- + c.getName());
- generatedKeys.put(t.getName(), c.getName());
- }
- }
- }
- }
-
- public void addRelationship(String parentName, String childName) {
- mapping.addRelationship(parentName, childName);
- }
-
- public void addPrimaryKey(String columnName) {
- mapping.addPrimaryKey(columnName);
- }
-
- public void addCollisionColumn(String columnName) {
- mapping.addCollisionColumn(columnName);
- }
-
- public void addPrimarykey(Key key) {
- mapping.addPrimaryKey(key);
- }
-
- public void addGeneratedPrimaryKey(String columnName) {
- QualifiedColumn col = new QualifiedColumn(columnName);
- generatedKeys.put(col.getTableName(), col.getColumnName());
- mapping.addGeneratedPrimaryKey(columnName);
- }
-
- public void addConverter(String name, String converterName) {
- mapping.addConverter(name, converterName);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
deleted file mode 100644
index 364007d8cf..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Mangages a set of graph-change operations. This simple implementaiton can be
- * replaced with a version that provides R/I sorting
- *
- */
-public class Changes {
-
- private InsertList inserts = new InsertList();
- private UpdateList updates = new UpdateList();
- private DeleteList deletes = new DeleteList();
-
-// private static final boolean debug = false;
-
- public void addInsert(ChangeOperation c) {
- inserts.add(c);
- }
-
- public void addUpdate(ChangeOperation c) {
- updates.add(c);
- }
-
- public void addDelete(ChangeOperation c) {
- deletes.add(c);
- }
-
- /**
- * Execute all my change
- */
- public void execute() {
-
- Iterator i = inserts.getSortedList().iterator();
- while ( i.hasNext() ) {
- ChangeOperation c = (ChangeOperation) i.next();
- c.execute();
- }
-
- i = updates.getSortedList().iterator();
- while ( i.hasNext() ) {
- ChangeOperation c = (ChangeOperation) i.next();
- c.execute();
- }
-
-
- i = deletes.getSortedList().iterator();
- while (i.hasNext() ) {
- ChangeOperation c = (ChangeOperation) i.next();
- c.execute();
- }
-
- }
-
- public void setInsertOrder(ArrayList insertOrder) {
- inserts.setOrder(insertOrder);
- }
-
- public void setDeleteOrder(ArrayList deleteOrder) {
- deletes.setOrder(deleteOrder);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java
deleted file mode 100644
index 6d719e6254..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.CommandFactory;
-
-
-public class CommandFactoryImpl implements CommandFactory {
-
- protected Map namedCommands = new HashMap();
-
- public Command createCommand(String sql) {
- return createCommand(sql, null);
- }
-
- public Command createCommand(String sql, InputStream model) {
-
- sql = sql.trim(); //Remove leading white space
- char firstChar = Character.toUpperCase(sql.charAt(0));
- switch (firstChar) {
- case 'S':
- return new ReadCommandImpl(sql, model);
- case 'I':
- return new InsertCommandImpl(sql);
- case 'U':
- return new UpdateCommandImpl(sql);
- case 'D':
- return new DeleteCommandImpl(sql);
- case '{':
- return new SPCommandImpl(sql);
- default:
- throw new Error("SQL => " + sql + " is not valid");
- }
-
- }
-
- public Command createReadCommand(String sql) {
- return new ReadCommandImpl(sql);
- }
-
- public Command createReadCommand(String sql, InputStream model) {
- return new ReadCommandImpl(sql, model);
- }
-
- public ApplyChangesCommand createApplyChangesCommand() {
- return new ApplyChangesCommandImpl();
- }
-
- public ApplyChangesCommand createApplyChangesCommand(
- InputStream mappingModel) throws IOException {
- return new ApplyChangesCommandImpl(mappingModel);
- }
-
- public Command getCommand (String name) {
- return (Command) namedCommands.get(name);
- }
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java
deleted file mode 100644
index 766a63de7c..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupFactoryImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.InputStream;
-
-import org.apache.tuscany.das.rdb.CommandGroup;
-import org.apache.tuscany.das.rdb.CommandGroupFactory;
-
-public class CommandGroupFactoryImpl implements CommandGroupFactory {
-
-
- public CommandGroup createCommandGroup(InputStream configStream) {
- return new CommandGroupImpl(configStream);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
deleted file mode 100644
index 35f77fb934..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.CommandGroup;
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl;
-
-import commonj.sdo.helper.XMLHelper;
-
-/**
- * An ConfiguredCommandFactory produces instances of Command and
- * ApplyChangesCommand. This factory is initialized with a configuration that
- * defines the commands it produces.
- *
- * <p>
- * TODO - This is still underdevelopment and is likely to replace CommandFactory
- * as the preferred mechanism to set commands at runtime.
- *
- *
- */
-public class CommandGroupImpl implements CommandGroup {
-
- private Config config;
-
- private Connection connection;
-
- private Map commands = new HashMap();
-
- public CommandGroupImpl(InputStream stream) {
- super();
- setConfig(stream);
- initialize();
- }
-
- private void initialize() {
-
- Iterator i = config.getCommand().iterator();
- while (i.hasNext()) {
- org.apache.tuscany.das.rdb.config.Command commandConfig = (org.apache.tuscany.das.rdb.config.Command) i
- .next();
- String kind = commandConfig.getKind();
- if (kind.equalsIgnoreCase("select"))
- commands.put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(), config));
- else if (kind.equalsIgnoreCase("update"))
- commands.put(commandConfig.getName(), new UpdateCommandImpl(commandConfig.getSQL()));
- else if (kind.equalsIgnoreCase("insert"))
- commands.put(commandConfig.getName(), new InsertCommandImpl(commandConfig.getSQL()));
- else if (kind.equalsIgnoreCase("delete"))
- commands.put(commandConfig.getName(), new DeleteCommandImpl(commandConfig.getSQL()));
- else
- throw new Error("Invalid kind of command: " + kind);
-
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.das.rdb.CommandGroup#getApplyChangesCommand()
- */
- public ApplyChangesCommand getApplyChangesCommand() {
- ApplyChangesCommand cmd = new ApplyChangesCommandImpl(config);
- cmd.setConnection(getConnection());
- return cmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.das.rdb.CommandGroup#getCommand(java.lang.String)
- */
- public Command getCommand(String name) {
- if (!commands.containsKey(name))
- throw new RuntimeException("CommandGroup has no command named: " + name);
- Command cmd = (Command) commands.get(name);
- cmd.setConnection(getConnection());
- return cmd;
- }
-
- // Private
-
- private void setConfig(InputStream stream) {
- XMLHelper helper = XMLHelper.INSTANCE;
-
- ConfigPackageImpl impl = ConfigPackageImpl.eINSTANCE;
-
- try {
- config = (Config) helper.load(stream).getRootObject();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public void setConnection(Connection connection) {
- this.connection = connection;
- }
-
- public Connection getConnection() {
- if (connection == null)
- initializeConnection();
- return connection;
- }
-
- private void initializeConnection() {
-
- ConnectionProperties cp = config.getConnectionProperties();
- if (cp == null)
- throw new Error(
- "No connection properties have been configured and no connection has been provided");
-
- if (cp.getDataSource() != null)
- initViaDataSource(cp);
- else
- initViaDriverManager(cp);
-
- }
-
- private void initViaDriverManager(ConnectionProperties cp) {
- Connection connection = null;
-
- try {
- Class.forName(cp.getDriverClassName());
- if (cp.getDriverUserName() == null)
- connection = DriverManager.getConnection(cp.getDriverURL());
- else
- connection = DriverManager.getConnection(cp.getDriverURL(), cp.getDriverUserName(), cp
- .getDriverPassword());
- connection.setAutoCommit(false);
- setConnection(connection);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
-
- }
-
- //TODO - Refactor to eliminate common initialization code after connection is got
- private void initViaDataSource(ConnectionProperties cp) {
-
- Connection connection = null;
-
- InitialContext ctx;
- try {
- ctx = new InitialContext();
- } catch (NamingException e) {
- throw new Error(e);
- }
- try {
- //TODO - I think we should rename this getDataSourceURL?
- DataSource ds = (DataSource) ctx.lookup(cp.getDataSource());
- try {
- connection = ds.getConnection();
- connection.setAutoCommit(false);
- setConnection(connection);
- } catch (SQLException e) {
- throw new Error (e);
- }
- } catch (NamingException e) {
- throw new Error(e);
- }
-
- }
-} \ No newline at end of file
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
deleted file mode 100644
index 5272a0b911..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.sql.Connection;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Key;
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.ResultSetShape;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XSDHelper;
-
-public abstract class CommandImpl implements Command {
-
- protected Statement statement;
-
- protected Parameters parameters = new Parameters();
-
- protected MappingWrapper mappingModel = new MappingWrapper();
-
- protected static final boolean debug = false;
-
- protected ResultSetShape resultSetShape;
-
- public CommandImpl(String sqlString) {
- statement = new Statement(sqlString);
-
- try {
- URL url = getClass().getResource("/xml/sdoJava.xsd");
- if (url == null)
- throw new RuntimeException(
- "Could not find resource: xml/sdoJava.xsd");
-
- InputStream inputStream = url.openStream();
- XSDHelper.INSTANCE.define(inputStream, url.toString());
- inputStream.close();
- } catch ( IOException ex ) {
- throw new RuntimeException(ex);
- }
-
- }
-
- public abstract void execute();
-
- public abstract DataObject executeQuery();
-
- public void setParameterValue(String name, Object value) {
- parameters.setParameter(name, value);
- }
-
- public void setParameterValue(int index, Object value) {
- parameters.setParameter(index, value);
- }
-
- public void setParameterType(String name, Type dataType) {
- parameters.setParameterWithType(name, dataType);
- }
-
- public void setParameterType(int index, Type dataType) {
- parameters.setParameterWithType(index, dataType);
- }
-
- public void addParameter(int index, Type sdoType) {
- addParameter(index, Parameter.IN, sdoType);
- }
-
- public void addParameter(int index, int direction, Type sdoType) {
- parameters.findOrCreateParameterWithIndex(index, direction, sdoType);
- }
-
- public void addParameter(String name, Type sdoType) {
- addParameter(name, Parameter.IN, sdoType);
- }
-
- public void addParameter(String name, int direction, Type sdoType) {
- parameters.setParameterWithType(name, sdoType);
- }
-
- public void addParameter(Parameter param) {
- parameters.add(param);
- }
-
- public Parameter getParameter(String name) {
- return parameters.get(name);
- }
-
- public Parameter getParameter(int index) {
- return parameters.get(index);
-
- }
-
- public List getParameters() {
- return parameters.parameterList();
- }
-
- public Object getParameterValue(String name) {
- Parameter p = parameters.get(name);
- if (p == null)
- throw new RuntimeException("Parameter with name " + name
- + " not found");
-
- return p;
- }
-
- public Object getParameterValue(int index) {
- return parameters.parameterWithIndex(index).getValue();
- }
-
- public void setConnection(Connection connection) {
- setConnection(new ConnectionImpl(connection));
- }
-
- public void setConnection(Connection connection, boolean manageTransaction) {
- ConnectionImpl c = new ConnectionImpl(connection);
- c.setManageTransactions(manageTransaction);
- setConnection(c);
- }
-
- public void setConnection(ConnectionImpl connection) {
- statement.setConnection(connection);
- }
-
- protected ConnectionImpl getConnection() {
- return statement.getConnection();
- }
-
- public void addRelationship(String parentName, String childName) {
- mappingModel.addRelationship(parentName, childName);
- }
-
- public void addRelationship(Key parentKey, Key childKey) {
- mappingModel.addRelationship(parentKey, childKey);
- }
-
- public void addPrimaryKey(String pk) {
- mappingModel.addPrimaryKey(pk);
- }
-
- public void addPrimaryKey(Key pk) {
- mappingModel.addPrimaryKey(pk);
- }
-
- public void setResultSetShape(ResultSetShape shape) {
- this.resultSetShape = shape;
- }
-
- public void addConverter(String name, String converter) {
- mappingModel.addConverter(name, converter);
- }
-
- public void close() {
- statement.close();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
deleted file mode 100644
index 2da21bf930..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-
-public class ConnectionImpl {
-
- private Connection connection;
- private static final boolean debug = false;
-
- private boolean managingTransaction = true;
-
- public ConnectionImpl(Connection connection) {
- this.connection = connection;
-
- try {
- if (connection.getAutoCommit())
- throw new RuntimeException("AutoCommit must be off!");
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public Connection getJDBCConnection() {
- return connection;
- }
-
- public void cleanUp() {
- try {
- if (managingTransaction) {
- DebugUtil.debugln(getClass(), debug, "Committing Transaction");
- connection.commit();
- }
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
- public void errorCleanUp() {
- try {
- if (managingTransaction) {
- DebugUtil.debugln(getClass(), debug, "Rolling back Transaction");
- connection.rollback();
- }
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
- public PreparedStatement prepareStatement(QueryString queryString)
- throws SQLException {
- DebugUtil.debugln(getClass(), debug, "Preparing Statement: " + queryString.getPreparedString());
- return connection.prepareStatement(queryString.getPreparedString(), java.sql.Statement.RETURN_GENERATED_KEYS);
- }
-
- public PreparedStatement preparePagedStatement(QueryString queryString) throws SQLException {
- DebugUtil.debugln(getClass(), debug, "Preparing Statement: " + queryString.getPreparedString());
- return connection.prepareStatement(queryString.getPreparedString(), ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
- }
-
- public void setManageTransactions(boolean manageTransactions) {
- managingTransaction = manageTransactions;
-
- }
-
- public CallableStatement prepareCall(QueryString queryString) throws SQLException {
- return connection.prepareCall(queryString.getPreparedString());
- }
-
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
deleted file mode 100644
index 87e6e063d7..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-
-import commonj.sdo.DataObject;
-
-public class CreateOperation extends ChangeOperation {
-
- public CreateOperation(WriteCommandImpl command, DataObject changedObject, String ID) {
- super(command, changedObject);
- this.propagatedID = ID;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
deleted file mode 100644
index d3b00b2e7b..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.KeyPair;
-import org.apache.tuscany.das.rdb.config.Relationship;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-/**
- * DatabaseObject wraps DataObject. If a field is an FK field, it will return
- * the value from the parent.
- *
- *
- */
-public class DatabaseObject {
-
- private final MappingWrapper mappingWrapper;
-
- private final DataObject dataObject;
-
- private Property parentReference;
-
- private static final boolean debug = false;
-
- private HashMap keyMappings = new HashMap();
-
- public DatabaseObject(Config model, DataObject changedObject) {
- this.mappingWrapper = new MappingWrapper(model);
- this.dataObject = changedObject;
- initialize();
- }
-
- // Initialize Key Mappings
- private void initialize() {
- if (mappingWrapper.getConfig() != null) {
- List relationships = mappingWrapper.getConfig().getRelationship();
- Iterator i = relationships.iterator();
- while (i.hasNext()) {
- Relationship r = (Relationship) i.next();
- DebugUtil.debugln(getClass(), debug,
- "Initializing relationship: " + r.getName());
- if (r.getForeignKeyTable().equals(getTypeName())) {
- List pairs = r.getKeyPair();
- Iterator iter = pairs.iterator();
- while (iter.hasNext()) {
- KeyPair pair = (KeyPair) iter.next();
- keyMappings.put(pair.getForeignKeyColumn(), r);
- }
- }
- }
- }
- }
-
- public Object get(String parameter) {
- Relationship r = (Relationship) keyMappings.get(parameter);
- if (r == null)
- return dataObject.get(parameter);
-
- Property parentRef = getParentReference(r.getPrimaryKeyTable());
- DataObject parent = dataObject.getDataObject(parentRef);
- String parentKey = getParentKey(r, parameter);
- return parent.get(parentKey);
-
- }
-
- private String getParentKey(Relationship r, String parameter) {
- List keyPairs = r.getKeyPair();
- Iterator i = keyPairs.iterator();
- while (i.hasNext()) {
- KeyPair pair = (KeyPair) i.next();
- if (pair.getForeignKeyColumn().equals(parameter))
- return pair.getPrimaryKeyColumn();
- }
- return null;
- }
-
- public Property getParentReference(String parentName) {
- if (this.parentReference == null) {
-
- Iterator i = dataObject.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property ref = (Property) i.next();
- if ((!ref.getType().isDataType()) &&
- (ref.getType().getName().equals(parentName))) {
- this.parentReference = ref;
- }
- }
- }
- return this.parentReference;
- }
-
- public String getTableName() {
- if (mappingWrapper.getConfig() != null)
- return mappingWrapper.getTableByPropertyName(getTypeName())
- .getName();
- else
- return null;
- }
-
- public String getTypeName() {
- return dataObject.getType().getName();
- }
-
- public void setPropagatedID(String propagatedID, int id) {
- dataObject.setInt(propagatedID, id);
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
deleted file mode 100644
index 3502784b6f..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-public class DeleteCommandImpl extends WriteCommandImpl {
-
- public DeleteCommandImpl(String sqlString) {
- super(sqlString);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
deleted file mode 100644
index 8650c6119c..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * DeleteList will sort delete operations so that child objects are deleted
- * before their parents
- *
- *
- */
-public class DeleteList {
-
- private HashMap opsByTableName = new HashMap();
-
- private ArrayList order;
-
- private ArrayList deleteOperations = new ArrayList();
-
- public DeleteList() {
- super();
- }
-
- public void add(ChangeOperation op) {
- if (( order == null ) || ( op.getTableName() == null ) ) {
- deleteOperations.add(op);
- } else {
- String name = op.getTableName();
- ArrayList ops = (ArrayList) opsByTableName.get(name);
- if (ops == null)
- ops = new ArrayList();
-
- ops.add(op);
- opsByTableName.put(name, ops);
- }
- }
-
- public Collection getSortedList() {
- if (( order != null ) && ( opsByTableName.keySet().size() > 0) ) {
- Iterator i = this.order.iterator();
- while (i.hasNext()) {
- String name = (String) i.next();
- deleteOperations.addAll((Collection) opsByTableName.get(name));
- }
- }
-
- return deleteOperations;
- }
-
- public void setOrder(ArrayList deleteOrder) {
- this.order = deleteOrder;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
deleted file mode 100644
index 100cc15d7b..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import org.apache.tuscany.das.rdb.util.DataObjectUtil;
-
-import commonj.sdo.DataObject;
-
-public class DeleteOperation extends ChangeOperation {
-
-
- /**
- * @param command
- * @param changedObject
- * Objects deleted from the graph have lost their "settings" and must
- * be restored
- */
- public DeleteOperation(WriteCommandImpl command, DataObject changedObject) {
- super(command);
- this.dObject = new DatabaseObject(command.getMappingModel(),DataObjectUtil.getRestoredCopy(changedObject));
-
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
deleted file mode 100644
index ce09c748f4..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.HashMap;
-
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.Type;
-
-public class FactoryRegistry {
-
- private HashMap registry = new HashMap();
- private static final boolean debug = false;
- private final MappingWrapper mapping;
- private final ConnectionImpl connection;
-
- public FactoryRegistry(MappingWrapper mapping, ConnectionImpl connection) {
- this.mapping = mapping;
- this.connection = connection;
- }
-
- public ChangeFactory getFactory(Type type) {
- ChangeFactory factory = (ChangeFactory)registry.get(type);
- if ( factory == null ) {
- DebugUtil.debugln(getClass(), debug, "Creating new ChangeFactory for type " + type.getName());
- factory = new ChangeFactory(type, mapping, connection);
- registry.put(type, factory);
- }
- return factory;
- }
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
deleted file mode 100644
index 9c890c7106..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.SQLException;
-
-public class InsertCommandImpl extends WriteCommandImpl {
-
- private int generatedKey;
-
- private boolean hasGeneratedKey = false;
-
- public InsertCommandImpl(String sqlString) {
- super(sqlString);
- }
-
- protected boolean isInsert() {
- return true;
- }
-
- public int getGeneratedKey() {
-
- if (hasGeneratedKey)
- return generatedKey;
-
- throw new RuntimeException("No generated key is available");
- }
-
- public Object getParameterValue(String name) {
-
- if (name.equals("generated_key"))
- if (hasGeneratedKey)
- return new Integer(generatedKey);
- else
- throw new RuntimeException("No generated key available");
-
- return super.getParameterValue(name);
- }
-
- protected void subtypeProcessing() throws SQLException {
- loadGeneratedKey();
- }
-
- private void loadGeneratedKey() throws SQLException {
- Integer key = statement.getGeneratedKey();
- if (key != null) {
- hasGeneratedKey = true;
- generatedKey = key.intValue();
- }
-
- }
-
- public String toString() {
-
- String superString = super.toString();
- StringBuffer buffer = new StringBuffer(superString);
-
- buffer.append("\nGenerating key: " + hasGeneratedKey);
- if (hasGeneratedKey)
- buffer.append("\nGenerated key: " + generatedKey);
-
- return buffer.toString();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
deleted file mode 100644
index ba86107247..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-/**
- * InsertList will sort ChangeOperation objects so that parents are inserted
- * before children
- *
- *
- */
-public class InsertList {
-
- private HashMap opsByTableName = new HashMap();
-
- private ArrayList insertOperations = new ArrayList();
-
- private ArrayList order;
-
- private static final boolean debug = false;
-
- public void add(ChangeOperation op) {
- DebugUtil.debugln(getClass(), debug, "Adding insert operation ");
- if ((order.size() == 0) || (op.getTableName() == null)) {
- insertOperations.add(op);
- } else {
- String name = op.getTableName();
- ArrayList ops = (ArrayList) opsByTableName.get(name);
- if (ops == null)
- ops = new ArrayList();
-
- ops.add(op);
- opsByTableName.put(name, ops);
- }
- }
-
- public Collection getSortedList() {
- DebugUtil.debugln(getClass(), debug, "Getting sorted insert list");
- if ((order.size() > 0) && opsByTableName.keySet().size() > 0) {
- Iterator i = this.order.iterator();
- while (i.hasNext()) {
- String name = (String) i.next();
- DebugUtil.debugln(getClass(), debug,
- "Adding operations for table " + name);
- // TODO - KJW added null check ... Brent to verify.
- if (opsByTableName.get(name) != null)
- insertOperations.addAll((Collection) opsByTableName
- .get(name));
- }
- }
- DebugUtil.debugln(getClass(), debug, "Returning "
- + insertOperations.size() + " insert operations");
- return insertOperations;
- }
-
- public void setOrder(ArrayList insertOrder) {
- this.order = insertOrder;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
deleted file mode 100644
index ffdd1499ac..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.SQLException;
-
-public class OptimisticWriteCommandImpl extends WriteCommandImpl {
-
- public OptimisticWriteCommandImpl(String sqlString) {
- super(sqlString);
- }
-
- public void execute() {
-
- boolean success = false;
- try {
- int rowsAffected = statement.executeUpdate(parameters);
- success = true;
- if ( rowsAffected == 0 )
- throw new RuntimeException("OCC Exception");
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
-
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
deleted file mode 100644
index 32b17ef3e7..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Pager;
-
-import commonj.sdo.DataObject;
-
-public class PagerImpl implements Pager {
-
- private final ReadCommandImpl command;
- private final int size;
- private int idx = 1;
-
- public PagerImpl(Command command, int size) {
- this.command = (ReadCommandImpl)command;
- this.command.enablePaging();
- this.size = size;
- }
-
- public DataObject next() {
- int start = idx;
- int end = idx + size;
- idx += size;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
-
- public DataObject getPage(int page) {
- int end = (page * size) + 1;
- int start = end - size;
- idx = end;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
-
- public DataObject previous() {
- int start = idx - (2 * size);
- if ( start < 1 )
- start = 1;
- int end = start + size;
- idx = end;
- command.setStartRow(start);
- command.setEndRow(end);
- return command.executeQuery();
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
deleted file mode 100644
index 4528661b2c..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.Parameter;
-
-import commonj.sdo.Type;
-
-public class ParameterImpl implements Parameter {
-
- private int index;
- private Type type;
- private String name;
- private Object value;
- private int direction = IN;
- private Converter converter;
-
- public ParameterImpl() {
- super();
- }
-
- public ParameterImpl(String name) {
- this.name = name;
- }
-
- public ParameterImpl(int index) {
- this.index = index;
- }
-
- public void setType(Type type) {
- this.type = type;
- }
-
- public void setIndex(int index) {
- if ( index == 0 )
- throw new RuntimeException("Index of zero not allowed");
- this.index = index;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setValue(Object value) {
- this.value = value;
- }
-
- public void setDirection(int direction) {
- this.direction = direction;
- }
-
- public Type getType() {
- return this.type;
- }
-
- public int getIndex() {
- return this.index;
- }
-
- public String getName() {
- return this.name;
- }
-
- public Object getValue() {
- if ( getConverter() != null ) {
- return getConverter().getColumnValue(this.value);
- } else {
- return this.value;
- }
- }
-
- public int getDirection() {
- return this.direction;
- }
-
- public void setConverter(Converter converter) {
- this.converter = converter;
- }
-
- public Converter getConverter() {
- return this.converter;
- }
-
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("Index: " + getIndex());
- buffer.append("\nName: " + getName());
- buffer.append("\nValue: " + getValue());
- return buffer.toString();
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
deleted file mode 100644
index 4ea42f41b2..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.SDODataTypes;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.Type;
-
-public class Parameters {
-
- private ArrayList parameters = new ArrayList();
-
- private ArrayList inParams = new ArrayList();
-
- private ArrayList outParams = new ArrayList();
-
- private HashMap parametersByName = new HashMap();
-
- private static boolean debug = false;
-
- public Parameters() {
- super();
- }
-
- public Parameter get(String name) {
- return (Parameter) parametersByName.get(name);
- }
-
- public Parameter get(int index) {
- return (Parameter) parameters.get(index);
- }
-
- public List outParams() {
- return outParams;
- }
-
- public List inParams() {
- return inParams;
- }
-
- private void addParameter(Parameter param) {
- if (param.getDirection() == Parameter.IN)
- inParams.add(param);
- else if ((param.getDirection() == Parameter.OUT)
- || (param.getDirection() == Parameter.IN_OUT))
- outParams.add(param);
-
- this.parameters.add(param);
- parametersByName.put(param.getName(), param);
- }
-
- public void add(Parameter param) {
- addParameter(param);
- }
-
- public Parameter findOrCreateParameterNamed(String name) {
- Parameter param = get(name);
- if (param == null) {
- param = new ParameterImpl(name);
- addParameter(param);
- }
- return param;
- }
-
- public Parameter findOrCreateParameterWithIndex(int index, int direction,
- Type sdoType) {
- Iterator i = parameters.iterator();
- while (i.hasNext()) {
- Parameter param = (Parameter) i.next();
-
- if (param.getIndex() == index)
- return param;
- }
- DebugUtil.debugln(getClass(), debug,
- "Creating new parameter with index " + index);
- Parameter newParam = new ParameterImpl(index);
- newParam.setDirection(direction);
- newParam.setType(sdoType);
- addParameter(newParam);
- return newParam;
- }
-
- public List parameterList() {
- return parameters;
- }
-
- public Parameter findOrCreateParameterWithIndex(int index) {
- return findOrCreateParameterWithIndex(index, Parameter.IN,
- SDODataTypes.OBJECT);
- }
-
- public void setParameter(int index, Object value) {
- Parameter param = findOrCreateParameterWithIndex(index);
- param.setValue(value);
- }
-
- public void setParameter(String name, Object value) {
- if (name == null)
- throw new RuntimeException("Null parameter name not allowed");
- Parameter param = findOrCreateParameterNamed(name);
- param.setValue(value);
- }
-
- public void setParameterWithType(String name, Type sdoType) {
- if (name == null)
- throw new RuntimeException("Null parameter name not allowed");
- Parameter p = findOrCreateParameterNamed(name);
- p.setType(sdoType);
- }
-
- public void setParameterWithType(int index, Type sdoType) {
- if (index == 0)
- throw new RuntimeException("Null parameter index not allowed");
- Parameter p = findOrCreateParameterWithIndex(index);
- p.setType(sdoType);
- }
-
- public Parameter parameterWithIndex(int index) {
- Iterator i = parameters.iterator();
- while (i.hasNext()) {
- Parameter param = (Parameter) i.next();
-
- if (param.getIndex() == index)
- return param;
- }
- return null;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java
deleted file mode 100644
index 8304457a72..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-
-public class QueryString {
-
- private final String unmodifiedQueryString;
- private final String preparedString;
- private HashMap parameters = new HashMap();
- private static final boolean debug = false;
-
- public QueryString(String originalString) {
- this.unmodifiedQueryString = originalString;
- this.preparedString = replaceNamesAndSetIndexes(originalString);
- }
-
- public String getPreparedString() {
- return this.preparedString;
- }
-
- public String getUnmodifiedString() {
- return this.unmodifiedQueryString;
- }
-
- public int getParameterIndex(String name) {
- DebugUtil.debugln(getClass(), debug, "Looking for parameter index for: " + name);
- //System.out.println(toString());
- return ((Integer)parameters.get(name)).intValue();
- }
-
- private String replaceNamesAndSetIndexes(String query) {
- DebugUtil.debugln(getClass(), debug, "Parameterizing query: " + query);
- Pattern p = Pattern.compile(":[\\S&&[^,()]]*");
- Matcher m = p.matcher(query);
-
- int index = 1;
- while (m.find()) {
- parameters.put(m.group().substring(1), new Integer(index));
- query = m.replaceFirst("?");
- m = p.matcher(query);
- index++;
- }
-
- DebugUtil.debugln(getClass(), debug, "Parameterized query: " + query);
- return query;
- }
-
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("\nOriginal SQL: ");
- buffer.append(unmodifiedQueryString);
- buffer.append("\nPrepared SQL: ");
- buffer.append(preparedString);
- buffer.append("\nParameters: ");
- Iterator i = parameters.keySet().iterator();
- while ( i.hasNext() ) {
- String key = (String)i.next();
- buffer.append("\n");
- buffer.append(key);
- }
- return buffer.toString();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
deleted file mode 100644
index dd58c98e5b..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultSetProcessor;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XMLHelper;
-
-public class ReadCommandImpl extends CommandImpl {
-
- private Type schema;
-
- private int startRow = 1;
-
- private int endRow = Integer.MAX_VALUE;
-
- public ReadCommandImpl(String sqlString) {
- super(sqlString);
- }
-
- public ReadCommandImpl(String sqlString, InputStream modelStream) {
- this(sqlString);
- if (modelStream != null)
- setMappingModel(modelStream);
- }
-
- public ReadCommandImpl(String sqlString, Config mapping) {
- this(sqlString);
- if (mapping != null)
- setMappingModel(mapping);
- }
-
- public void execute() {
- throw new UnsupportedOperationException();
- }
-
- public DataObject executeQuery() {
-
- if (statement.getConnection() == null)
- throw new RuntimeException(
- "A DASConnection object must be specified before executing the query.");
-
- boolean success = false;
- try {
- ResultSet rs = statement.executeQuery(parameters);
- success = true;
- return buildGraph(rs);
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
- }
-
- protected DataObject buildGraph(ResultSet result) throws SQLException {
-
- List results = new ArrayList();
- results.add(result);
-
- // Before we use the mappingModel, do some checking/updating. If
- // inferrable information
- // isn't specified, add it in.
-
-
- GraphBuilderMetadata gbmd = new GraphBuilderMetadata(results,
- getSchema(), mappingModel.getConfig(), resultSetShape);
-
- DataGraph g = createEDataGraph(gbmd.getSchema());
- ChangeSummary summary = g.getChangeSummary();
-
- ResultSetProcessor rsp = new ResultSetProcessor(g.getRootObject(), gbmd);
- rsp.processResults(getStartRow(), getEndRow());
-
- summary.beginLogging();
-
- return g.getRootObject();
- }
-
- private Type getSchema() {
- return (Type) schema;
- }
-
- protected int getStartRow() {
- return startRow;
- }
-
- protected int getEndRow() {
- return endRow;
- }
-
- protected void setStartRow(int startRow) {
- this.startRow = startRow;
- }
-
- protected void setEndRow(int endRow) {
- this.endRow = endRow;
- }
-
- private DataGraph createEDataGraph(Type type) {
-
- DataGraph g = SDOUtil.createDataGraph();
-
- // Create a ResourceSet to contain the DataGraph
- ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-
- // Create a Resource to hold the schema
-
- Resource r = resourceSet.createResource(URI.createURI(type.getURI()));
- r.getContents().add(g);
-
- // Create the root object
- g.createRootObject(type);
-
- return g;
- }
-
- private void setMappingModel(Config mapping) {
- mappingModel = new MappingWrapper(mapping);
- }
-
- public void setMappingModel(InputStream stream) {
-
- XMLHelper helper = XMLHelper.INSTANCE;
-
-// ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
-// metadata.putPackage(null, ConfigPackageImpl.eINSTANCE);
-
- try {
- Config config = (Config) helper.load(stream).getRootObject();
- mappingModel = new MappingWrapper(config);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
-
- if (mappingModel.getConfig().getConnectionProperties() != null)
- setConnection(mappingModel.getConfig().getConnectionProperties());
-
- }
-
- public void setConnection(ConnectionProperties c) {
- try {
- Connection connection = null;
- Class.forName(c.getDriverClassName());
- if (c.getDriverUserName() == null)
- connection = DriverManager.getConnection(c.getDriverURL());
- else
- connection = DriverManager.getConnection(c.getDriverURL(), c
- .getDriverUserName(), c.getDriverPassword());
- connection.setAutoCommit(false);
- setConnection(connection);
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
-
- public void setDataObjectModel(Type schema) {
- this.schema = schema;
- }
-
- protected void enablePaging() {
- statement.enablePaging();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
deleted file mode 100644
index 7afa3b8563..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.Types;
-
-import org.apache.tuscany.das.rdb.SDODataTypes;
-
-import commonj.sdo.Type;
-
-public class SDODataTypeHelper {
-
- static public int sqlTypeFor(Type sdoType) {
- if ( sdoType == SDODataTypes.BOOLEAN)
- return Types.BOOLEAN;
- else if ( sdoType == SDODataTypes.STRING)
- return Types.VARCHAR;
- else if ( sdoType == SDODataTypes.BYTE)
- return Types.TINYINT;
- else if ( sdoType == SDODataTypes.BYTES)
- return Types.BINARY;
- else if ( sdoType == SDODataTypes.CHARACTER)
- return Types.CHAR;
- else if ( sdoType == SDODataTypes.DATE)
- return Types.DATE;
- else if ( sdoType == SDODataTypes.DATETIME)
- return Types.DATE;
- else if ( sdoType == SDODataTypes.DAY )
- return java.sql.Types.BINARY;
- else if ( sdoType == SDODataTypes.DECIMAL )
- return java.sql.Types.DECIMAL;
- else if ( sdoType == SDODataTypes.DOUBLE )
- return java.sql.Types.DOUBLE;
- else if ( sdoType == SDODataTypes.DURATION )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.FLOAT )
- return java.sql.Types.REAL;
- else if ( sdoType == SDODataTypes.INT )
- return java.sql.Types.INTEGER;
- else if ( sdoType == SDODataTypes.INTEGER )
- return java.sql.Types.INTEGER;
- else if ( sdoType == SDODataTypes.LONG )
- return java.sql.Types.BIGINT;
- else if ( sdoType == SDODataTypes.MONTH )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.MONTHDAY )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.OBJECT )
- return java.sql.Types.JAVA_OBJECT;
- else if ( sdoType == SDODataTypes.SHORT )
- return java.sql.Types.SMALLINT;
- else if ( sdoType == SDODataTypes.STRING )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.STRINGS )
- return java.sql.Types.OTHER;
- else if ( sdoType == SDODataTypes.TIME )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.URI )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.YEAR )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.YEARMONTH )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.YEARMONTHDAY )
- return java.sql.Types.VARCHAR;
- else if ( sdoType == SDODataTypes.BOOLEANOBJECT )
- return java.sql.Types.BOOLEAN;
- else if ( sdoType == SDODataTypes.BYTEOBJECT )
- return java.sql.Types.TINYINT;
- else if ( sdoType == SDODataTypes.CHARACTEROBJECT )
- return java.sql.Types.CHAR;
- else if ( sdoType == SDODataTypes.DOUBLEOBJECT )
- return java.sql.Types.DOUBLE;
- else if ( sdoType == SDODataTypes.FLOATOBJECT )
- return java.sql.Types.REAL;
- else if ( sdoType == SDODataTypes.INTEGEROBJECT )
- return java.sql.Types.INTEGER;
- else if ( sdoType == SDODataTypes.LONGOBJECT )
- return java.sql.Types.BIGINT;
- else if ( sdoType == SDODataTypes.SHORTOBJECT )
- return java.sql.Types.SMALLINT;
- else
- throw new RuntimeException("Not a valid SDO Type " + sdoType);
-
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
deleted file mode 100644
index 8308ee4397..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.io.InputStream;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-import commonj.sdo.DataObject;
-
-public class SPCommandImpl extends ReadCommandImpl {
-
- public SPCommandImpl(String sqlString) {
- super(sqlString);
- }
-
- public SPCommandImpl(String sqlString, InputStream modelStream) {
- super(sqlString, modelStream);
- }
-
- public DataObject executeQuery() {
-
- boolean success = false;
- try {
- ResultSet rs = statement.executeCall(parameters);
- success = true;
-
- return buildGraph(rs);
- } catch (SQLException e) {
- DebugUtil.debugln(getClass(), debug, e);
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
- }
-
- public void execute() {
-
- boolean success = false;
- try {
- statement.executeUpdateCall(parameters);
- success = true;
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
-
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
deleted file mode 100644
index 6bc18dc229..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.util.DebugUtil;
-
-//TODO - Can use some refactoring. Much code is duplicated in "execute" methods
-public class Statement {
-
- protected final QueryString queryString;
-
- protected ConnectionImpl jdbcConnection;
-
- private static final boolean debug = false;
-
- private PreparedStatement preparedStatement;
-
- private boolean isPaging = false;
-
- public Statement(String sqlString) {
- this.queryString = new QueryString(sqlString);
- }
-
- public ResultSet executeQuery(Parameters parameters) throws SQLException {
-
- PreparedStatement ps = getPreparedStatement();
- ps = setParameters(ps, parameters);
- ResultSet rs = ps.executeQuery();
-
- return rs;
- }
-
- public ResultSet executeCall(Parameters parameters) throws SQLException {
- try {
- CallableStatement cs = jdbcConnection.prepareCall(queryString);
-
- Iterator inParams = parameters.inParams().iterator();
- while (inParams.hasNext()) {
- Parameter param = (Parameter) inParams.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- cs.setObject(param.getIndex(), param.getValue());
- }
-
- // register out parameters
- Iterator outParams = parameters.outParams().iterator();
- while (outParams.hasNext()) {
- Parameter param = (Parameter) outParams.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- DebugUtil.debugln(getClass(), debug, "Registering parameter " + param.getName());
- cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
- }
-
- // Using execute because Derby does not currenlty support
- // executeQuery
- // for SP
- cs.execute();
- ResultSet results = cs.getResultSet();
-
- Iterator i = parameters.outParams().iterator();
- while (i.hasNext()) {
- Parameter param = (Parameter) i.next();
- param.setValue(cs.getObject(param.getIndex()));
- }
-
- return results;
- } catch (SQLException ex) {
- ex.printStackTrace();
- throw ex;
- }
-
- }
-
- public void executeUpdateCall(Parameters parameters) throws SQLException {
- CallableStatement cs = jdbcConnection.prepareCall(queryString);
-
- Iterator inParams = parameters.inParams().iterator();
- while (inParams.hasNext()) {
- Parameter param = (Parameter) inParams.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- cs.setObject(param.getIndex(), param.getValue());
- }
-
- // register out parameters
- Iterator outParams = parameters.outParams().iterator();
- while (outParams.hasNext()) {
- Parameter param = (Parameter) outParams.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- DebugUtil.debugln(getClass(), debug, "Registering parameter " + param.getName());
- cs.registerOutParameter(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
- }
-
- cs.execute();
-
- Iterator out = parameters.outParams().iterator();
- while (out.hasNext()) {
- Parameter param = (Parameter) out.next();
- param.setValue(cs.getObject(param.getIndex()));
- }
-
- }
-
- /**
- * TODO - We need to look at using specific ps.setXXX methods when a type
- * has been specified and try setObject otherwise.
- */
- public int executeUpdate(Parameters parameters) throws SQLException {
- DebugUtil.debugln(getClass(), debug, "Executing statement " + queryString.getPreparedString());
- PreparedStatement ps = getPreparedStatement();
- Iterator i = parameters.inParams().iterator();
- while (i.hasNext()) {
- Parameter param = (Parameter) i.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- Object value = param.getValue();
- DebugUtil.debugln(getClass(), debug, "Setting parameter " + param.getIndex() + " to " + value);
- if (value == null) {
- ps.setNull(param.getIndex(), SDODataTypeHelper.sqlTypeFor(param.getType()));
- } else {
- ps.setObject(param.getIndex(), value);
- }
- }
- return ps.executeUpdate();
- }
-
- protected PreparedStatement setParameters(PreparedStatement ps, Parameters parameters)
- throws SQLException {
- Iterator i = parameters.inParams().iterator();
- while (i.hasNext()) {
- Parameter param = (Parameter) i.next();
- if (param.getIndex() == 0)
- param.setIndex(queryString.getParameterIndex(param.getName()));
- ps.setObject(param.getIndex(), param.getValue());
- }
- return ps;
- }
-
- public void setConnection(ConnectionImpl jdbcConnection) {
- this.jdbcConnection = jdbcConnection;
- }
-
- public ConnectionImpl getConnection() {
- return this.jdbcConnection;
- }
-
- private PreparedStatement getPreparedStatement() throws SQLException {
- DebugUtil.debugln(getClass(), debug, "Getting prepared statement");
- if (preparedStatement == null)
- if (isPaging)
- preparedStatement = jdbcConnection.preparePagedStatement(queryString);
- else
- preparedStatement = jdbcConnection.prepareStatement(queryString);
-
- return preparedStatement;
- }
-
- public Integer getGeneratedKey() throws SQLException {
-
- ResultSet rs = getPreparedStatement().getGeneratedKeys();
- if (rs.next())
- return new Integer(rs.getInt(1));
-
- return null;
- }
-
- protected void enablePaging() {
- isPaging = true;
- }
-
- public void close() {
-
- if (this.preparedStatement != null) {
- try {
- preparedStatement.close();
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
deleted file mode 100644
index 7fffe97d5d..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-public class UpdateCommandImpl extends WriteCommandImpl {
-
- public UpdateCommandImpl(String sqlString) {
- super(sqlString);
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
deleted file mode 100644
index 1ab2f16fca..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Updates don't have to be sorted, so this class is a simple wrapper of ArrayList.
- *
- */
-public class UpdateList {
-
- private ArrayList updates = new ArrayList();
-
- public UpdateList() {
- super();
- }
-
- public void add(ChangeOperation c) {
- updates .add(c);
- }
-
- public Collection getSortedList() {
- return updates;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
deleted file mode 100644
index 94bb20be1d..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.impl;
-
-
-import commonj.sdo.DataObject;
-
-
-public class UpdateOperation extends ChangeOperation {
-
- public UpdateOperation(WriteCommandImpl command, DataObject changedObject, String id) {
- super(command, changedObject);
- this.propagatedID = id;
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
deleted file mode 100644
index c08ddda495..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-*
-* 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.
-*/
-package org.apache.tuscany.das.rdb.impl;
-
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.Parameter;
-import org.apache.tuscany.das.rdb.config.Config;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-
-public abstract class WriteCommandImpl extends CommandImpl {
-
-
- public WriteCommandImpl(String sqlString) {
- super(sqlString);
- }
-
- public void execute() {
-
- boolean success = false;
- try {
- statement.executeUpdate(parameters);
- subtypeProcessing();
- success = true;
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (success)
- statement.getConnection().cleanUp();
- else
- statement.getConnection().errorCleanUp();
- }
-
- }
-
- public DataObject executeQuery() {
- throw new UnsupportedOperationException();
- }
-
- public Config getMappingModel() {
- return this.mappingModel.getConfig();
- }
-
-
- /**
- * Subclasses add specific bahavior
- * Default is to do nothing
- */
- protected void subtypeProcessing() throws SQLException {
- if ( false )
- throw new SQLException();
- }
-
- public void setDataObjectModel(Type schema) {
- // don't really care what the model is here
- }
-
- public String toString() {
-
- StringBuffer buffer = new StringBuffer();
- buffer.append("\nSQL: " + statement.queryString.getUnmodifiedString());
- buffer.append("\nModified SQL: " + statement.queryString.getPreparedString());
- return buffer.toString();
- }
-
- public int getGeneratedKey() {
- throw new RuntimeException("No generated key is available");
- }
-
- public void addParameters(Collection updateParameters) {
- Iterator i = updateParameters.iterator();
- while ( i.hasNext()) {
- Parameter p = (Parameter) i.next();
- addParameter(p);
- }
- }
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
deleted file mode 100644
index 15943da067..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.merge.impl;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.MultiTableRegistry;
-import org.apache.tuscany.das.rdb.graphbuilder.impl.TableRegistry;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-public class GraphMerger {
-
- private HashMap keys = new HashMap();
-
- private TableRegistry registry = new MultiTableRegistry();
-
- private static Logger logger = Logger.getLogger("GraphMerger");
-
- //TODO lots of cleanup/design
- public GraphMerger() {
- // Empty Constructor
- }
-
- public DataObject merge(List graphs) {
- DataObject primaryGraph = (DataObject) graphs.get(0);
-
- Iterator i = graphs.iterator();
- if (i.hasNext())
- i.next();
- while (i.hasNext()) {
- primaryGraph = merge(primaryGraph, (DataObject) i.next());
- }
-
- return primaryGraph;
- }
-
- public DataObject merge(DataObject primary, DataObject secondary) {
- addGraphToRegistry(primary);
-
- ChangeSummary summary = primary
- .getDataGraph().getChangeSummary();
- summary.endLogging();
- Iterator i = secondary.getType().getProperties().iterator();
-
- while (i.hasNext()) {
- Property p = (Property) i.next();
-
- Iterator objects = secondary.getList(p.getName()).iterator();
- while (objects.hasNext()) {
- DataObject object = (DataObject) objects.next();
- createObjectWithSubtree(primary, p, object);
- }
- }
- ((ChangeSummaryImpl)summary).resumeLogging();
- return primary;
- }
-
- private void createObjectWithSubtree(DataObject root, Property p,
- DataObject object) {
- Object pk = getPrimaryKey(object);
-
- if (!registry.contains(object.getType().getName(), Collections
- .singletonList(pk))) {
- // logger.info("creating " + object.getType().getName() + " with pk " + pk);
- DataObject newObject = root.createDataObject(p.getName());
-
-
-
- Iterator attrs = object.getType().getProperties().iterator();
- while (attrs.hasNext()) {
- Property attr = (Property) attrs.next();
- if ( attr.getType().isDataType()) {
- newObject.set(attr.getName(), object.get(attr));
- }
- }
- registry.put(object.getType().getName(), Collections
- .singletonList(pk), newObject);
-
- Iterator refs = object.getType().getProperties().iterator();
- while (refs.hasNext()) {
- Property ref = (Property) refs.next();
- if ( !ref.getType().isDataType()) {
- List refObjects;
- if (!ref.isMany()) {
- refObjects = Collections.singletonList(object.get(ref));
- } else {
- refObjects = (List) object.get(ref);
- }
-
- Iterator iter = refObjects.iterator();
- while (iter.hasNext()) {
- DataObject refObject = (DataObject) iter.next();
- createObjectWithSubtree(root, refObject
- .getContainmentProperty(), refObject);
-
- refObject = (DataObject) registry.get(refObject.getType().getName(), Collections.singletonList(getPrimaryKey(refObject)));
- if (ref.isMany()) {
- newObject.getList(
- newObject.getType().getProperty(ref.getName()))
- .add(refObject);
- } else
- newObject.set(newObject.getType().getProperty(
- ref.getName()), refObject);
- }
- }
-
- }
-
- }
-
- }
-
- private void addGraphToRegistry(DataObject graph1) {
- Iterator i = graph1.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property p = (Property) i.next();
- Iterator objects = graph1.getList(p).iterator();
- while (objects.hasNext()) {
- DataObject object = (DataObject) objects.next();
- Object pk = object.get(getPrimaryKeyName(object));
- logger.finest("Adding object with pk " + pk + " to registry");
- registry.put(object.getType().getName(), Collections
- .singletonList(pk), object);
- }
- }
- }
-
- private Object getPrimaryKey(DataObject object) {
- String pkName = getPrimaryKeyName(object);
- return object.get(pkName);
- }
-
- private String getPrimaryKeyName(DataObject object) {
- return (String) keys.get(object.getType().getName());
- }
-
- public void addPrimaryKey(String key) {
- QualifiedColumn column = new QualifiedColumn(key);
- logger.finest("Adding " + column.getTableName() + " "
- + column.getColumnName() + " to keys");
- keys.put(column.getTableName(), column.getColumnName());
- }
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
deleted file mode 100644
index 7f96f9aef4..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.ChangeSummary.Setting;
-import commonj.sdo.helper.DataFactory;
-
-/**
- */
-public class DataObjectUtil {
-
- //Utilities
- public static DataObject getRestoredCopy(DataObject changedDO) {
- DataObject changedCopy = getCopy(changedDO);
- restoreAttributeValues(changedCopy, changedDO);
- return changedCopy;
- }
-
- public static DataObject getCopy(DataObject original) {
-
- DataObject copy = DataFactory.INSTANCE.create(original.getType());
-
- //Fill in values
- Iterator i = original.getType().getProperties().iterator();
- while (i.hasNext()) {
- Property feature = (Property) i.next();
- copy.set(feature, original.get(feature));
- }
- return copy;
- }
-
- /**
- * @param changedCopy
- * @return
- */
- private static void restoreAttributeValues(DataObject changedCopy, DataObject changedDO) {
-
- ChangeSummary changeSummary = changedDO.getDataGraph().getChangeSummary();
- List changes = changeSummary.getOldValues(changedDO);
- if ( changes == null )
- return;
-
- Iterator i = changes.iterator();
- while (i.hasNext()) {
- Setting s = (Setting) i.next();
- if ( s.getProperty().getType().isDataType() )
- changedCopy.set(s.getProperty(), s.getValue());
- }
- }
-
-
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java
deleted file mode 100644
index ed2e1063d6..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.util;
-
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-public class DebugFormatter extends Formatter {
-
- public String format(LogRecord record) {
- StringBuffer message = new StringBuffer();
- message.append("[");
- message.append(record.getSourceClassName());
- message.append("] ");
- message.append(record.getMessage());
- message.append("\n");
- return message.toString();
- }
-
-}
diff --git a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java b/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java
deleted file mode 100644
index 745fe8cb7e..0000000000
--- a/tags/java-stable-20060304/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.tuscany.das.rdb.util;
-
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-//TODO Restructure Logging
-public class DebugUtil {
-
- private static StringBuffer buffer = new StringBuffer();
- private static final Logger logger = Logger.getAnonymousLogger();
-
- static {
- logger.setUseParentHandlers(false);
- Handler h = new ConsoleHandler();
- h.setFormatter(new DebugFormatter());
- logger.addHandler(h);
- }
- public static void debugln(Class c, boolean flag, Object obj) {
-
- if ( flag ) {
- logger.logp(Level.INFO, getClassName(c), null, obj.toString() );
- }
- }
-
- public static void debug(Class c, boolean flag, Object obj) {
- if ( flag ) {
- System.out.print("[" + getClassName(c) + "] " + obj );
- }
- }
-
- public static void buffer(boolean flag, Object obj) {
- if ( flag )
- buffer.append(obj);
- }
-
- public static void flushBuffer(Class c, boolean flag) {
- if ( flag ) {
- System.out.println("[" + getClassName(c) + "] " + buffer.toString());
- buffer = new StringBuffer();
- }
- }
-
- private static String getClassName(Class c) {
- String className = c.getName();
- return className.substring(className.lastIndexOf(".") + 1);
- }
-
-}